![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cb59d85)
raw | patch | inline | side by side (parent: cb59d85)
| author | Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com> | |
| Wed, 28 Sep 2016 09:43:08 +0000 (10:43 +0100) | ||
| committer | Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com> | |
| Mon, 26 Dec 2016 13:26:05 +0000 (13:26 +0000) |
Disable clang-format for diagram in utils_ovs.c.
Change-Id: Idfb1510c996f5ebbdadc96663eb032537837502a
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Change-Id: Idfb1510c996f5ebbdadc96663eb032537837502a
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
| src/ovs_events.c | patch | blob | history | |
| src/utils_ovs.c | patch | blob | history | |
| src/utils_ovs.h | patch | blob | history |
diff --git a/src/ovs_events.c b/src/ovs_events.c
index 2eedf99dc5321e23d565487ae1e8a6b618f5df1f..dd42021d8f50071460dd1eaec0ae14c28b99744e 100644 (file)
--- a/src/ovs_events.c
+++ b/src/ovs_events.c
* Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com>
**/
-#include "common.h" /* auxiliary functions */
+#include "common.h" /* auxiliary functions */
-#include "utils_ovs.h" /* OVS helpers */
+#include "utils_ovs.h" /* OVS helpers */
#define OVS_EVENTS_IFACE_NAME_SIZE 128
#define OVS_EVENTS_IFACE_UUID_SIZE 64
#define OVS_EVENTS_EXT_IFACE_ID_SIZE 64
-#define OVS_EVENTS_EXT_VM_UUID_SIZE 64
+#define OVS_EVENTS_EXT_VM_UUID_SIZE 64
#define OVS_EVENTS_OVS_DB_URL_SIZE 64
#define OVS_EVENTS_PLUGIN "ovs_events"
-#define OVS_EVENTS_CTX_LOCK for (int __i = ovs_events_ctx_lock(); __i != 0 ; \
- __i = ovs_events_ctx_unlock())
-#define OVS_EVENTS_CONFIG_ERROR(option) do { \
- ERROR(OVS_EVENTS_PLUGIN ": read '%s' config option failed", option); \
- goto failure; } while (0)
+#define OVS_EVENTS_CTX_LOCK \
+ for (int __i = ovs_events_ctx_lock(); __i != 0; __i = ovs_events_ctx_unlock())
+#define OVS_EVENTS_CONFIG_ERROR(option) \
+ do { \
+ ERROR(OVS_EVENTS_PLUGIN ": read '%s' config option failed", option); \
+ goto failure; \
+ } while (0)
/* Link status type */
-enum ovs_events_link_status_e {DOWN, UP};
+enum ovs_events_link_status_e { DOWN, UP };
typedef enum ovs_events_link_status_e ovs_events_link_status_t;
/* Interface info */
struct ovs_events_iface_info_s {
- char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */
- char uuid[OVS_EVENTS_IFACE_UUID_SIZE]; /* interface UUID */
- char ext_iface_id[OVS_EVENTS_EXT_IFACE_ID_SIZE]; /* external interface id */
- char ext_vm_uuid[OVS_EVENTS_EXT_VM_UUID_SIZE]; /* external VM UUID */
- ovs_events_link_status_t link_status; /* interface link status */
- struct ovs_events_iface_info_s *next; /* next interface info */
+ char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */
+ char uuid[OVS_EVENTS_IFACE_UUID_SIZE]; /* interface UUID */
+ char ext_iface_id[OVS_EVENTS_EXT_IFACE_ID_SIZE]; /* external interface id */
+ char ext_vm_uuid[OVS_EVENTS_EXT_VM_UUID_SIZE]; /* external VM UUID */
+ ovs_events_link_status_t link_status; /* interface link status */
+ struct ovs_events_iface_info_s *next; /* next interface info */
};
typedef struct ovs_events_iface_info_s ovs_events_iface_info_t;
/* Interface list */
struct ovs_events_iface_list_s {
- char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */
- struct ovs_events_iface_list_s *next; /* next interface info */
+ char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */
+ struct ovs_events_iface_list_s *next; /* next interface info */
};
typedef struct ovs_events_iface_list_s ovs_events_iface_list_t;
/* OVS events configuration data */
struct ovs_events_config_s {
- _Bool send_notification; /* sent notification to collectd? */
- char ovs_db_server_url[OVS_EVENTS_OVS_DB_URL_SIZE]; /* OVS DB server URL */
- ovs_events_iface_list_t *ifaces; /* interface info */
+ _Bool send_notification; /* sent notification to collectd? */
+ char ovs_db_server_url[OVS_EVENTS_OVS_DB_URL_SIZE]; /* OVS DB server URL */
+ ovs_events_iface_list_t *ifaces; /* interface info */
};
typedef struct ovs_events_config_s ovs_events_config_t;
/* OVS events context type */
struct ovs_events_ctx_s {
- pthread_mutex_t mutex; /* mutex to lock the context */
- ovs_db_t *ovs_db; /* pointer to OVS DB instance */
- ovs_events_config_t config; /* plugin config */
- char *ovs_db_select_params; /* OVS DB select parameter request */
- _Bool is_db_available; /* specify whether OVS DB is available */
+ pthread_mutex_t mutex; /* mutex to lock the context */
+ ovs_db_t *ovs_db; /* pointer to OVS DB instance */
+ ovs_events_config_t config; /* plugin config */
+ char *ovs_db_select_params; /* OVS DB select parameter request */
+ _Bool is_db_available; /* specify whether OVS DB is available */
};
typedef struct ovs_events_ctx_s ovs_events_ctx_t;
* Private variables
*/
static ovs_events_ctx_t ovs_events_ctx = {
- .mutex = PTHREAD_MUTEX_INITIALIZER,
- .config = {
- .send_notification = 0, /* do not send notification */
- .ovs_db_server_url = "tcp:127.0.0.1:6640", /* use default OVS DB URL */
- .ifaces = NULL},
- .ovs_db_select_params = NULL,
- .is_db_available = 0,
- .ovs_db = NULL};
+ .mutex = PTHREAD_MUTEX_INITIALIZER,
+ .config = {.send_notification = 0, /* do not send notification */
+ .ovs_db_server_url =
+ "tcp:127.0.0.1:6640", /* use default OVS DB URL */
+ .ifaces = NULL},
+ .ovs_db_select_params = NULL,
+ .is_db_available = 0,
+ .ovs_db = NULL};
/* This function is used only by "OVS_EVENTS_CTX_LOCK" define (see above).
* It always returns 1 when context is locked.
*/
-static inline int
-ovs_events_ctx_lock()
-{
+static inline int ovs_events_ctx_lock() {
pthread_mutex_lock(&ovs_events_ctx.mutex);
return (1);
}
/* This function is used only by "OVS_EVENTS_CTX_LOCK" define (see above).
* It always returns 0 when context is unlocked.
*/
-static inline int
-ovs_events_ctx_unlock()
-{
+static inline int ovs_events_ctx_unlock() {
pthread_mutex_unlock(&ovs_events_ctx.mutex);
return (0);
}
* returns 1 if exists otherwise 0. If no interfaces are configured,
* -1 is returned
*/
-static int
-ovs_events_config_iface_exists(const char *ifname)
-{
+static int ovs_events_config_iface_exists(const char *ifname) {
if (ovs_events_ctx.config.ifaces == NULL)
return -1;
/* Get OVS DB select parameter request based on rfc7047,
* "Transact" & "Select" section
*/
-static inline char *
-ovs_events_get_select_params()
-{
+static inline char *ovs_events_get_select_params() {
int ret = 0;
size_t buff_size = 0;
size_t offset = 0;
}
/* Release memory allocated for configuration data */
-static void
-ovs_events_config_free()
-{
+static void ovs_events_config_free() {
ovs_events_iface_list_t *del_iface = NULL;
sfree(ovs_events_ctx.ovs_db_select_params);
while (ovs_events_ctx.config.ifaces) {
/* Parse plugin configuration file and store the config
* in allocated memory. Returns negative value in case of error.
*/
-static int
-ovs_events_plugin_config(oconfig_item_t *ci)
-{
+static int ovs_events_plugin_config(oconfig_item_t *ci) {
ovs_events_iface_list_t *new_iface;
for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
if (strcasecmp("SendNotification", child->key) == 0) {
- if (cf_util_get_boolean(child,
- &ovs_events_ctx.config.send_notification) < 0)
+ if (cf_util_get_boolean(child, &ovs_events_ctx.config.send_notification) <
+ 0)
OVS_EVENTS_CONFIG_ERROR(child->key);
} else if (strcasecmp("OvsDbServerUrl", child->key) == 0) {
- if (cf_util_get_string_buffer(child,
- ovs_events_ctx.config.ovs_db_server_url,
- sizeof(ovs_events_ctx.config.
- ovs_db_server_url)) < 0)
+ if (cf_util_get_string_buffer(
+ child, ovs_events_ctx.config.ovs_db_server_url,
+ sizeof(ovs_events_ctx.config.ovs_db_server_url)) < 0)
OVS_EVENTS_CONFIG_ERROR(child->key);
} else if (strcasecmp("Interfaces", child->key) == 0) {
for (int j = 0; j < child->values_num; j++) {
/* check value type */
if (child->values[j].type != OCONFIG_TYPE_STRING) {
ERROR(OVS_EVENTS_PLUGIN
- ": given interface name is not a string [idx=%d]", j);
+ ": given interface name is not a string [idx=%d]",
+ j);
goto failure;
}
/* allocate memory for configured interface */
}
}
} else {
- ERROR(OVS_EVENTS_PLUGIN ": option '%s' is not allowed here",
- child->key);
+ ERROR(OVS_EVENTS_PLUGIN ": option '%s' is not allowed here", child->key);
goto failure;
}
}
/* Dispatch OVS interface link status event to collectd */
static void
-ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo)
-{
+ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo) {
const char *msg_link_status = NULL;
- notification_t n = {NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN,
- "", "", "", NULL};
+ notification_t n = {
+ NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN, "", "", "", NULL};
/* convert link status to message string */
switch (ifinfo->link_status) {
}
if (strlen(ifinfo->ext_vm_uuid) > 0)
- if (plugin_notification_meta_add_string
- (&n, "vm-uuid", ifinfo->ext_vm_uuid) < 0) {
+ if (plugin_notification_meta_add_string(&n, "vm-uuid",
+ ifinfo->ext_vm_uuid) < 0) {
ERROR(OVS_EVENTS_PLUGIN ": add interface vm-uuid meta data failed");
return;
}
if (strlen(ifinfo->ext_iface_id) > 0)
- if (plugin_notification_meta_add_string
- (&n, "iface-id", ifinfo->ext_iface_id) < 0) {
+ if (plugin_notification_meta_add_string(&n, "iface-id",
+ ifinfo->ext_iface_id) < 0) {
ERROR(OVS_EVENTS_PLUGIN ": add interface iface-id meta data failed");
return;
}
/* Dispatch OVS interface link status value to collectd */
static void
-ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo)
-{
+ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo) {
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
meta_data_t *meta = NULL;
}
/* Dispatch OVS DB terminate connection event to collectd */
-static void
-ovs_events_dispatch_terminate_notification(const char *msg)
-{
- notification_t n = {NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN,
- "", "", "", NULL};
+static void ovs_events_dispatch_terminate_notification(const char *msg) {
+ notification_t n = {
+ NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN, "", "", "", NULL};
sstrncpy(n.message, msg, sizeof(n.message));
sstrncpy(n.host, hostname_g, sizeof(n.host));
plugin_dispatch_notification(&n);
/* Get OVS DB interface information and stores it into
* ovs_events_iface_info_t structure */
-static int
-ovs_events_get_iface_info(yajl_val jobject, ovs_events_iface_info_t *ifinfo)
-{
+static int ovs_events_get_iface_info(yajl_val jobject,
+ ovs_events_iface_info_t *ifinfo) {
yajl_val jexternal_ids = NULL;
yajl_val jvalue = NULL;
yajl_val juuid = NULL;
* and dispatches the value(s) to collectd if interface name matches one of
* interfaces specified in configuration file.
*/
-static void
-ovs_events_table_update_cb(yajl_val jupdates)
-{
+static void ovs_events_table_update_cb(yajl_val jupdates) {
yajl_val jnew_val = NULL;
yajl_val jupdate = NULL;
yajl_val jrow_update = NULL;
* interface information and dispatches the info to
* collecd
*/
-static void
-ovs_events_poll_result_cb(yajl_val jresult, yajl_val jerror)
-{
+static void ovs_events_poll_result_cb(yajl_val jresult, yajl_val jerror) {
yajl_val *jvalues = NULL;
yajl_val jvalue = NULL;
ovs_events_iface_info_t ifinfo;
/* get interfaces info */
for (int j = 0; j < YAJL_GET_ARRAY(jvalue)->len; j++) {
memset(&ifinfo, 0, sizeof(ifinfo));
- if (ovs_events_get_iface_info
- (YAJL_GET_ARRAY(jvalue)->values[j], &ifinfo) < 0) {
+ if (ovs_events_get_iface_info(YAJL_GET_ARRAY(jvalue)->values[j],
+ &ifinfo) < 0) {
ERROR(OVS_EVENTS_PLUGIN
"unexpected interface information data received");
return;
}
- DEBUG("name=%s, uuid=%s, ext_iface_id=%s, ext_vm_uuid=%s",
- ifinfo.name, ifinfo.uuid, ifinfo.ext_iface_id,
- ifinfo.ext_vm_uuid);
+ DEBUG("name=%s, uuid=%s, ext_iface_id=%s, ext_vm_uuid=%s", ifinfo.name,
+ ifinfo.uuid, ifinfo.ext_iface_id, ifinfo.ext_vm_uuid);
ovs_events_link_status_submit(&ifinfo);
}
}
/* Setup OVS DB table callback. It subscribes to OVS DB 'Interface' table
* to receive link status event(s).
*/
-static void
-ovs_events_conn_initialize(ovs_db_t *pdb)
-{
+static void ovs_events_conn_initialize(ovs_db_t *pdb) {
int ret = 0;
const char tb_name[] = "Interface";
- const char *columns[] = {"_uuid", "external_ids",
- "name", "link_state", NULL};
+ const char *columns[] = {"_uuid", "external_ids", "name", "link_state", NULL};
/* register update link status event if needed */
if (ovs_events_ctx.config.send_notification) {
return;
}
}
- OVS_EVENTS_CTX_LOCK {
- ovs_events_ctx.is_db_available = 1;
- }
+ OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = 1; }
DEBUG(OVS_EVENTS_PLUGIN ": OVS DB has been initialized");
}
/* OVS DB terminate connection notification callback */
-static void
-ovs_events_conn_terminate()
-{
+static void ovs_events_conn_terminate() {
const char msg[] = "OVS DB connection has been lost";
if (ovs_events_ctx.config.send_notification)
ovs_events_dispatch_terminate_notification(msg);
WARNING(OVS_EVENTS_PLUGIN ": %s", msg);
- OVS_EVENTS_CTX_LOCK {
- ovs_events_ctx.is_db_available = 0;
- }
+ OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = 0; }
}
/* Read OVS DB interface link status callback */
-static int
-ovs_events_plugin_read(user_data_t *ud)
-{
- (void)ud; /* unused argument */
+static int ovs_events_plugin_read(user_data_t *ud) {
+ (void)ud; /* unused argument */
_Bool is_connected = 0;
- OVS_EVENTS_CTX_LOCK {
- is_connected = ovs_events_ctx.is_db_available;
- }
+ OVS_EVENTS_CTX_LOCK { is_connected = ovs_events_ctx.is_db_available; }
if (is_connected)
if (ovs_db_send_request(ovs_events_ctx.ovs_db, "transact",
ovs_events_ctx.ovs_db_select_params,
}
/* Initialize OVS plugin */
-static int
-ovs_events_plugin_init(void)
-{
+static int ovs_events_plugin_init(void) {
ovs_db_t *ovs_db = NULL;
ovs_db_callback_t cb = {.post_conn_init = ovs_events_conn_initialize,
.post_conn_terminate = ovs_events_conn_terminate};
}
/* store OVS DB handler */
- OVS_EVENTS_CTX_LOCK {
- ovs_events_ctx.ovs_db = ovs_db;
- }
+ OVS_EVENTS_CTX_LOCK { ovs_events_ctx.ovs_db = ovs_db; }
DEBUG(OVS_EVENTS_PLUGIN ": plugin has been initialized");
return (0);
}
/* Shutdown OVS plugin */
-static int
-ovs_events_plugin_shutdown(void)
-{
+static int ovs_events_plugin_shutdown(void) {
/* destroy OVS DB */
if (ovs_db_destroy(ovs_events_ctx.ovs_db))
ERROR(OVS_EVENTS_PLUGIN ": OVSDB object destroy failed");
}
/* Register OVS plugin callbacks */
-void
-module_register(void)
-{
+void module_register(void) {
plugin_register_complex_config(OVS_EVENTS_PLUGIN, ovs_events_plugin_config);
plugin_register_init(OVS_EVENTS_PLUGIN, ovs_events_plugin_init);
- plugin_register_complex_read(NULL, OVS_EVENTS_PLUGIN,
- ovs_events_plugin_read, 0, NULL);
+ plugin_register_complex_read(NULL, OVS_EVENTS_PLUGIN, ovs_events_plugin_read,
+ 0, NULL);
plugin_register_shutdown(OVS_EVENTS_PLUGIN, ovs_events_plugin_shutdown);
}
diff --git a/src/utils_ovs.c b/src/utils_ovs.c
index 636a38d2c517117268f51b116b193e458d7c6b42..92914ce6d2358749edee8a4f48287149c5672a4d 100644 (file)
--- a/src/utils_ovs.c
+++ b/src/utils_ovs.c
*
* Authors:
* Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com>
- *
+ **/
+
+/* clang-format off */
+/*
* OVS DB API internal architecture diagram
* +------------------------------------------------------------------------------+
* |OVS plugin |OVS utils |
* +-------------------+----------------------------------------------+-----------+
* | TCP/UNIX socket |
* +-------------------------------------------------------------------------------
- *
- **/
+ */
+/* clang-format on */
/* collectd headers */
#include "common.h"
#include "utils_ovs.h"
/* system libraries */
-#include <semaphore.h>
#include <arpa/inet.h>
#include <poll.h>
+#include <semaphore.h>
#include <sys/un.h>
-#define OVS_ERROR(fmt, ...) do { \
- ERROR("ovs_utils: "fmt, ## __VA_ARGS__); } while (0)
-#define OVS_DEBUG(fmt, ...) do { \
- DEBUG("%s:%d:%s(): "fmt, __FILE__, __LINE__, __FUNCTION__, \
- ## __VA_ARGS__); } while (0)
+#define OVS_ERROR(fmt, ...) \
+ do { \
+ ERROR("ovs_utils: " fmt, ##__VA_ARGS__); \
+ } while (0)
+#define OVS_DEBUG(fmt, ...) \
+ do { \
+ DEBUG("%s:%d:%s(): " fmt, __FILE__, __LINE__, __FUNCTION__, \
+ ##__VA_ARGS__); \
+ } while (0)
-#define OVS_DB_POLL_TIMEOUT 1 /* poll receive timeout (sec) */
-#define OVS_DB_POLL_READ_BLOCK_SIZE 512 /* read block size (bytes) */
-#define OVS_DB_DEFAULT_DB_NAME "Open_vSwitch"
-#define OVS_DB_RECONNECT_TIMEOUT 1 /* reconnect timeout (sec) */
+#define OVS_DB_POLL_TIMEOUT 1 /* poll receive timeout (sec) */
+#define OVS_DB_POLL_READ_BLOCK_SIZE 512 /* read block size (bytes) */
+#define OVS_DB_DEFAULT_DB_NAME "Open_vSwitch"
+#define OVS_DB_RECONNECT_TIMEOUT 1 /* reconnect timeout (sec) */
-#define OVS_DB_EVENT_TIMEOUT 5 /* event thread timeout (sec) */
-#define OVS_DB_EVENT_TERMINATE 1
-#define OVS_DB_EVENT_CONN_ESTABLISHED 2
-#define OVS_DB_EVENT_CONN_TERMINATED 3
+#define OVS_DB_EVENT_TIMEOUT 5 /* event thread timeout (sec) */
+#define OVS_DB_EVENT_TERMINATE 1
+#define OVS_DB_EVENT_CONN_ESTABLISHED 2
+#define OVS_DB_EVENT_CONN_TERMINATED 3
-#define OVS_DB_POLL_STATE_RUNNING 1
-#define OVS_DB_POLL_STATE_EXITING 2
+#define OVS_DB_POLL_STATE_RUNNING 1
+#define OVS_DB_POLL_STATE_EXITING 2
-#define OVS_DB_SEND_REQ_TIMEOUT 5 /* send request timeout (sec) */
+#define OVS_DB_SEND_REQ_TIMEOUT 5 /* send request timeout (sec) */
-#define OVS_YAJL_CALL(func, ...) \
- do { \
- yajl_gen_ret = yajl_gen_status_ok; \
- if ((yajl_gen_ret = func(__VA_ARGS__)) != yajl_gen_status_ok) \
- goto yajl_gen_failure; \
+#define OVS_YAJL_CALL(func, ...) \
+ do { \
+ yajl_gen_ret = yajl_gen_status_ok; \
+ if ((yajl_gen_ret = func(__VA_ARGS__)) != yajl_gen_status_ok) \
+ goto yajl_gen_failure; \
} while (0)
-#define OVS_YAJL_ERROR_BUFFER_SIZE 1024
-#define OVS_ERROR_BUFF_SIZE 512
-#define OVS_UID_STR_SIZE 17 /* 64-bit HEX string len + '\0' */
+#define OVS_YAJL_ERROR_BUFFER_SIZE 1024
+#define OVS_ERROR_BUFF_SIZE 512
+#define OVS_UID_STR_SIZE 17 /* 64-bit HEX string len + '\0' */
/* JSON reader internal data */
struct ovs_json_reader_s {
* OVS_DB_EVENT_CONN_ESTABLISHED
* OVS_DB_EVENT_CONN_TERMINATED
*/
-static void
-ovs_db_event_post(ovs_db_t *pdb, int event)
-{
+static void ovs_db_event_post(ovs_db_t *pdb, int event) {
pthread_mutex_lock(&pdb->event_thread.mutex);
pdb->event_thread.value = event;
pthread_mutex_unlock(&pdb->event_thread.mutex);
/* Check if POLL thread is still running. Returns
* 1 if running otherwise 0 is returned */
-static inline int
-ovs_db_poll_is_running(ovs_db_t *pdb)
-{
+static inline int ovs_db_poll_is_running(ovs_db_t *pdb) {
int state = 0;
pthread_mutex_lock(&pdb->poll_thread.mutex);
state = pdb->poll_thread.state;
}
/* Terminate POLL thread */
-static inline void
-ovs_db_poll_terminate(ovs_db_t *pdb)
-{
+static inline void ovs_db_poll_terminate(ovs_db_t *pdb) {
pthread_mutex_lock(&pdb->poll_thread.mutex);
pdb->poll_thread.state = OVS_DB_POLL_STATE_EXITING;
pthread_mutex_unlock(&pdb->poll_thread.mutex);
/* Generate unique identifier (UID). It is used by OVS DB API
* to set "id" field for any OVS DB JSON request. */
-static uint64_t
-ovs_uid_generate()
-{
+static uint64_t ovs_uid_generate() {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return ((ts.tv_sec << 32) | (ts.tv_nsec & UINT32_MAX));
*/
/* Add new callback into OVS DB object */
-static void
-ovs_db_callback_add(ovs_db_t *pdb, ovs_callback_t *new_cb)
-{
+static void ovs_db_callback_add(ovs_db_t *pdb, ovs_callback_t *new_cb) {
pthread_mutex_lock(&pdb->mutex);
if (pdb->remote_cb)
pdb->remote_cb->prev = new_cb;
}
/* Remove callback from OVS DB object */
-static void
-ovs_db_callback_remove(ovs_db_t *pdb, ovs_callback_t *del_cb)
-{
+static void ovs_db_callback_remove(ovs_db_t *pdb, ovs_callback_t *del_cb) {
ovs_callback_t *pre_cb = del_cb->prev;
ovs_callback_t *next_cb = del_cb->next;
}
/* Remove all callbacks form OVS DB object */
-static void
-ovs_db_callback_remove_all(ovs_db_t *pdb)
-{
+static void ovs_db_callback_remove_all(ovs_db_t *pdb) {
pthread_mutex_lock(&pdb->mutex);
for (ovs_callback_t *del_cb = pdb->remote_cb; pdb->remote_cb;
del_cb = pdb->remote_cb) {
/* Get/find callback in OVS DB object by UID. Returns pointer
* to requested callback otherwise NULL is returned */
-static ovs_callback_t *
-ovs_db_callback_get(ovs_db_t *pdb, uint64_t uid)
-{
+static ovs_callback_t *ovs_db_callback_get(ovs_db_t *pdb, uint64_t uid) {
pthread_mutex_lock(&pdb->mutex);
for (ovs_callback_t *cb = pdb->remote_cb; cb != NULL; cb = cb->next)
if (cb->uid == uid) {
/* Send all requested data to the socket. Returns 0 if
* ALL request data has been sent otherwise negative value
* is returned */
-static int
-ovs_db_data_send(const ovs_db_t *pdb, const char *data, size_t len)
-{
+static int ovs_db_data_send(const ovs_db_t *pdb, const char *data, size_t len) {
ssize_t nbytes = 0;
size_t rem = len;
size_t off = 0;
* "tcp:a.b.c.d:port" - define TCP connection (INET domain)
* "unix:file" - define UNIX socket file (UNIX domain)
*/
-static int
-ovs_db_url_parse(const char *surl, ovs_conn_t *conn)
-{
+static int ovs_db_url_parse(const char *surl, ovs_conn_t *conn) {
ovs_conn_t tmp_conn;
char *nexttok = NULL;
char *in_str = NULL;
} else {
/* <IP:PORT> */
tmp_conn.addr.s_inet.sin_family = AF_INET;
- ret =
- inet_pton(AF_INET, nexttok, (void *)&tmp_conn.addr.s_inet.sin_addr);
+ ret = inet_pton(AF_INET, nexttok, (void *)&tmp_conn.addr.s_inet.sin_addr);
if (ret == 1) {
if ((nexttok = strtok_r(NULL, ":", &saveptr)) != NULL)
tmp_conn.addr.s_inet.sin_port = htons(atoi(nexttok));
* jgen - YAJL generator handle allocated by yajl_gen_alloc()
* string - Null-terminated string
*/
-static inline yajl_gen_status
-ovs_yajl_gen_tstring(yajl_gen hander, const char *string)
-{
+static inline yajl_gen_status ovs_yajl_gen_tstring(yajl_gen hander,
+ const char *string) {
return yajl_gen_string(hander, string, strlen(string));
}
* jgen - YAJL generator handle allocated by yajl_gen_alloc()
* jval - YAJL value usually returned by yajl_tree_get()
*/
-static yajl_gen_status
-ovs_yajl_gen_val(yajl_gen jgen, yajl_val jval)
-{
+static yajl_gen_status ovs_yajl_gen_val(yajl_gen jgen, yajl_val jval) {
size_t array_len = 0;
yajl_val *jvalues = NULL;
yajl_val jobj_value = NULL;
* "echo" request to the client, client should generate
* "echo" replay with the same content received in the
* request */
-static int
-ovs_db_table_echo_cb(const ovs_db_t *pdb, yajl_val jnode)
-{
+static int ovs_db_table_echo_cb(const ovs_db_t *pdb, yajl_val jnode) {
yajl_val jparams;
yajl_val jid;
yajl_gen jgen;
* value should be YAJL string (UID). Returns NULL if
* callback hasn't been found.
*/
-static ovs_callback_t *
-ovs_db_table_callback_get(ovs_db_t *pdb, yajl_val jid)
-{
+static ovs_callback_t *ovs_db_table_callback_get(ovs_db_t *pdb, yajl_val jid) {
char *endptr = NULL;
const char *suid = NULL;
uint64_t uid;
if (jid && YAJL_IS_STRING(jid)) {
suid = YAJL_GET_STRING(jid);
- uid = (uint64_t) strtoul(suid, &endptr, 16);
+ uid = (uint64_t)strtoul(suid, &endptr, 16);
if (*endptr == '\0' && uid)
return ovs_db_callback_get(pdb, uid);
}
* table update callback is received from the DB
* server. Once registered callback found, it's called
* by this handler. */
-static int
-ovs_db_table_update_cb(ovs_db_t *pdb, yajl_val jnode)
-{
+static int ovs_db_table_update_cb(ovs_db_t *pdb, yajl_val jnode) {
ovs_callback_t *cb = NULL;
yajl_val jvalue;
yajl_val jparams;
* result reply is received from the DB server.
* Once registered callback found, it's called
* by this handler. */
-static int
-ovs_db_result_cb(ovs_db_t *pdb, yajl_val jnode)
-{
+static int ovs_db_result_cb(ovs_db_t *pdb, yajl_val jnode) {
ovs_callback_t *cb = NULL;
yajl_val jresult;
yajl_val jerror;
* update callback 'ovs_db_table_update_cb' and
* result callback 'ovs_db_result_cb' is supported.
*/
-static int
-ovs_db_json_data_process(ovs_db_t *pdb, const char *data, size_t len)
-{
+static int ovs_db_json_data_process(ovs_db_t *pdb, const char *data,
+ size_t len) {
const char *method = NULL;
char yajl_errbuf[OVS_YAJL_ERROR_BUFFER_SIZE];
const char *method_path[] = {"method", NULL};
*/
/* Allocate JSON reader instance */
-static inline ovs_json_reader_t *
-ovs_json_reader_alloc()
-{
+static inline ovs_json_reader_t *ovs_json_reader_alloc() {
ovs_json_reader_t *jreader = NULL;
if ((jreader = calloc(sizeof(ovs_json_reader_t), 1)) == NULL)
}
/* Push raw data into into the JSON reader for processing */
-static inline int
-ovs_json_reader_push_data(ovs_json_reader_t *jreader,
- const char *data, size_t data_len)
-{
+static inline int ovs_json_reader_push_data(ovs_json_reader_t *jreader,
+ const char *data, size_t data_len) {
char *new_buff = NULL;
size_t available = jreader->buff_size - jreader->buff_offset;
/* Pop one fully-fledged JSON if already exists. Returns 0 if
* completed JSON already exists otherwise negative value is
* returned */
-static inline int
-ovs_json_reader_pop(ovs_json_reader_t *jreader,
- const char **json_ptr, size_t *json_len_ptr)
-{
+static inline int ovs_json_reader_pop(ovs_json_reader_t *jreader,
+ const char **json_ptr,
+ size_t *json_len_ptr) {
size_t nbraces = 0;
size_t json_len = 0;
char *json = NULL;
/* Reset JSON reader. It is useful when start processing
* new raw data. E.g.: in case of lost stream connection.
*/
-static inline void
-ovs_json_reader_reset(ovs_json_reader_t *jreader)
-{
+static inline void ovs_json_reader_reset(ovs_json_reader_t *jreader) {
if (jreader) {
jreader->buff_offset = 0;
jreader->json_offset = 0;
}
/* Release internal data allocated for JSON reader */
-static inline void
-ovs_json_reader_free(ovs_json_reader_t *jreader)
-{
+static inline void ovs_json_reader_free(ovs_json_reader_t *jreader) {
if (jreader) {
free(jreader->buff_ptr);
free(jreader);
/* Reconnect to OVD DB and call init OVS DB callback
* 'init_cb' if connection has been established.
*/
-static int
-ovs_db_reconnect(ovs_db_t *pdb)
-{
+static int ovs_db_reconnect(ovs_db_t *pdb) {
char errbuff[OVS_ERROR_BUFF_SIZE];
/* remove all registered OVS DB table/result callbacks */
* requests/reply/events etc. Also, it reconnects to OVS DB
* if connection has been lost.
*/
-static void *
-ovs_poll_worker(void *arg)
-{
- ovs_db_t *pdb = (ovs_db_t *)arg; /* pointer to OVS DB */
+static void *ovs_poll_worker(void *arg) {
+ ovs_db_t *pdb = (ovs_db_t *)arg; /* pointer to OVS DB */
ovs_json_reader_t *jreader = NULL;
const char *json;
size_t json_len;
OVS_ERROR("recv() receive data error");
break;
}
- } /* poll() POLLIN & POLLPRI */
+ } /* poll() POLLIN & POLLPRI */
} else if (poll_ret == 0)
OVS_DEBUG("poll() timeout");
else {
* task can be done asynchronously which allows to
* handle OVD DB callback like 'init_cb'.
*/
-static void *
-ovs_event_worker(void *arg)
-{
+static void *ovs_event_worker(void *arg) {
int ret = 0;
ovs_db_t *pdb = (ovs_db_t *)arg;
struct timespec ts;
}
/* Stop EVENT thread */
-static int
-ovs_db_event_thread_stop(ovs_db_t *pdb)
-{
+static int ovs_db_event_thread_stop(ovs_db_t *pdb) {
ovs_db_event_post(pdb, OVS_DB_EVENT_TERMINATE);
if (pthread_join(pdb->event_thread.tid, NULL) != 0)
return (-1);
}
/* Stop POLL thread */
-static int
-ovs_db_poll_thread_stop(ovs_db_t *pdb)
-{
+static int ovs_db_poll_thread_stop(ovs_db_t *pdb) {
ovs_db_poll_terminate(pdb);
if (pthread_join(pdb->poll_thread.tid, NULL) != 0)
return (-1);
* Public OVS DB API implementation
*/
-ovs_db_t *
-ovs_db_init(const char *surl, ovs_db_callback_t *cb)
-{
+ovs_db_t *ovs_db_init(const char *surl, ovs_db_callback_t *cb) {
pthread_mutexattr_t mutex_attr;
ovs_db_t *pdb = NULL;
pthread_cond_init(&pdb->event_thread.cond, NULL);
pthread_mutex_init(&pdb->event_thread.mutex, NULL);
pthread_mutex_lock(&pdb->event_thread.mutex);
- if (plugin_thread_create(&pdb->event_thread.tid, NULL,
- ovs_event_worker, pdb) != 0) {
+ if (plugin_thread_create(&pdb->event_thread.tid, NULL, ovs_event_worker,
+ pdb) != 0) {
OVS_ERROR("event worker start failed");
goto failure;
}
ovs_db_reconnect(pdb);
pdb->poll_thread.state = OVS_DB_POLL_STATE_RUNNING;
pthread_mutex_init(&pdb->poll_thread.mutex, NULL);
- if (plugin_thread_create(&pdb->poll_thread.tid, NULL,
- ovs_poll_worker, pdb) != 0) {
+ if (plugin_thread_create(&pdb->poll_thread.tid, NULL, ovs_poll_worker, pdb) !=
+ 0) {
OVS_ERROR("pull worker start failed");
goto failure;
}
return NULL;
}
-int
-ovs_db_send_request(ovs_db_t *pdb, const char *method,
- const char *params, ovs_db_result_cb_t cb)
-{
+int ovs_db_send_request(ovs_db_t *pdb, const char *method, const char *params,
+ ovs_db_result_cb_t cb) {
int ret = 0;
yajl_gen_status yajl_gen_ret;
yajl_val jparams;
}
/* send the request */
- OVS_YAJL_CALL(yajl_gen_get_buf, jgen, (const unsigned char **)&req,
- &req_len);
+ OVS_YAJL_CALL(yajl_gen_get_buf, jgen, (const unsigned char **)&req, &req_len);
OVS_DEBUG("%s", req);
if (!ovs_db_data_send(pdb, req, req_len)) {
if (cb) {
return (yajl_gen_ret != yajl_gen_status_ok) ? (-1) : ret;
}
-int
-ovs_db_table_cb_register(ovs_db_t *pdb, const char *tb_name,
- const char **tb_column, ovs_db_table_cb_t update_cb,
- ovs_db_result_cb_t result_cb, unsigned int flags)
-{
+int ovs_db_table_cb_register(ovs_db_t *pdb, const char *tb_name,
+ const char **tb_column,
+ ovs_db_table_cb_t update_cb,
+ ovs_db_result_cb_t result_cb, unsigned int flags) {
yajl_gen jgen;
yajl_gen_status yajl_gen_ret;
ovs_callback_t *new_cb = NULL;
return ovs_db_ret;
}
-int
-ovs_db_destroy(ovs_db_t *pdb)
-{
+int ovs_db_destroy(ovs_db_t *pdb) {
int ovs_db_ret = 0;
int ret = 0;
*/
/* Get YAJL value by key from YAJL dictionary */
-yajl_val
-ovs_utils_get_value_by_key(yajl_val jval, const char *key)
-{
+yajl_val ovs_utils_get_value_by_key(yajl_val jval, const char *key) {
const char *obj_key = NULL;
/* check params */
}
/* Get OVS DB map value by given map key */
-yajl_val
-ovs_utils_get_map_value(yajl_val jval, const char *key)
-{
+yajl_val ovs_utils_get_map_value(yajl_val jval, const char *key) {
size_t map_len = 0;
size_t array_len = 0;
yajl_val *map_values = NULL;
diff --git a/src/utils_ovs.h b/src/utils_ovs.h
index aa91e30a5f9dfd8a4b6604f8c3c443fa1fa24760..1ddda4de786d8a940efca53c14149a0a5b5bee42 100644 (file)
--- a/src/utils_ovs.h
+++ b/src/utils_ovs.h
#ifndef UTILS_OVS_H
#define UTILS_OVS_H
-#include <yajl/yajl_tree.h>
#include <yajl/yajl_gen.h>
+#include <yajl/yajl_tree.h>
/* Forward declaration */
typedef struct ovs_db_s ovs_db_t;
/* OVS DB callback type declaration */
-typedef void (*ovs_db_table_cb_t) (yajl_val jupdates);
-typedef void (*ovs_db_result_cb_t) (yajl_val jresult, yajl_val jerror);
+typedef void (*ovs_db_table_cb_t)(yajl_val jupdates);
+typedef void (*ovs_db_result_cb_t)(yajl_val jresult, yajl_val jerror);
/* OVS DB structures */
struct ovs_db_callback_s {
* to subscribe to table update notification or poll
* some OVS DB data. This field can be NULL.
*/
- void (*post_conn_init) (ovs_db_t *pdb);
+ void (*post_conn_init)(ovs_db_t *pdb);
/*
* This callback is called when OVD DB connection
* has been lost. This field can be NULL.
*/
- void (*post_conn_terminate) (void);
+ void (*post_conn_terminate)(void);
};
typedef struct ovs_db_callback_s ovs_db_callback_t;
* RETURN VALUE
* Zero upon success or non-zero if an error occurred.
*/
-int ovs_db_send_request(ovs_db_t *pdb, const char *method,
- const char *params, ovs_db_result_cb_t cb);
+int ovs_db_send_request(ovs_db_t *pdb, const char *method, const char *params,
+ ovs_db_result_cb_t cb);
/* callback types */
#define OVS_DB_TABLE_CB_FLAG_INITIAL 0x01U
-#define OVS_DB_TABLE_CB_FLAG_INSERT 0x02U
-#define OVS_DB_TABLE_CB_FLAG_DELETE 0x04U
-#define OVS_DB_TABLE_CB_FLAG_MODIFY 0x08U
-#define OVS_DB_TABLE_CB_FLAG_ALL 0x0FU
+#define OVS_DB_TABLE_CB_FLAG_INSERT 0x02U
+#define OVS_DB_TABLE_CB_FLAG_DELETE 0x04U
+#define OVS_DB_TABLE_CB_FLAG_MODIFY 0x08U
+#define OVS_DB_TABLE_CB_FLAG_ALL 0x0FU
/*
* NAME
int ovs_db_table_cb_register(ovs_db_t *pdb, const char *tb_name,
const char **tb_column,
ovs_db_table_cb_t update_cb,
- ovs_db_result_cb_t result_cb,
- unsigned int flags);
+ ovs_db_result_cb_t result_cb, unsigned int flags);
/*
* OVS utils API