good for merge On Thu, 2009-12-03 at 13:12 +1300, angus salkeld wrote: > Signed-off-by: Angus Salkeld <[email protected]> > --- > exec/coroipcs.c | 2 +- > exec/main.c | 141 > ++++++++++++++++++++++++++++--------------------------- > exec/objdb.c | 58 ++++++++++++----------- > exec/totemsrp.c | 20 ++++---- > 4 files changed, 112 insertions(+), 109 deletions(-) > > diff --git a/exec/coroipcs.c b/exec/coroipcs.c > index 54448cc..59dbf21 100644 > --- a/exec/coroipcs.c > +++ b/exec/coroipcs.c > @@ -1560,7 +1560,7 @@ static void coroipcs_init_conn_stats ( > > conn->stats_handle = api->stats_create_connection (conn_name, > conn->client_pid, conn->fd); > api->stats_update_value (conn->stats_handle, "service_id", > - > &conn->service, sizeof(conn->service)); > + &conn->service, sizeof(conn->service)); > } > > int coroipcs_handler_dispatch ( > diff --git a/exec/main.c b/exec/main.c > index 951b13d..82e2c86 100644 > --- a/exec/main.c > +++ b/exec/main.c > @@ -543,18 +543,18 @@ static void corosync_totem_stats_updater (void *data) > avg_token_holdtime = (total_token_holdtime / token_count); > > objdb->object_key_replace (stats->mrp->srp->hdr.handle, > - "mtt_rx_token", strlen("mtt_rx_token"), > - &mtt_rx_token, sizeof (mtt_rx_token)); > + "mtt_rx_token", strlen("mtt_rx_token"), > + &mtt_rx_token, sizeof (mtt_rx_token)); > objdb->object_key_replace (stats->mrp->srp->hdr.handle, > - "avg_token_workload", > strlen("avg_token_workload"), > - &avg_token_holdtime, sizeof (avg_backlog_calc)); > + "avg_token_workload", strlen("avg_token_workload"), > + &avg_token_holdtime, sizeof (avg_backlog_calc)); > objdb->object_key_replace (stats->mrp->srp->hdr.handle, > - "avg_backlog_calc", strlen("avg_backlog_calc"), > - &avg_backlog_calc, sizeof (avg_backlog_calc)); > + "avg_backlog_calc", strlen("avg_backlog_calc"), > + &avg_backlog_calc, sizeof (avg_backlog_calc)); > } > api->timer_add_duration (1500 * MILLI_2_NANO_SECONDS, NULL, > - corosync_totem_stats_updater, > - &corosync_stats_timer_handle); > + corosync_totem_stats_updater, > + &corosync_stats_timer_handle); > } > > static void corosync_totem_stats_init (void) > @@ -579,17 +579,17 @@ static void corosync_totem_stats_init (void) > &object_runtime_handle) == 0) { > > objdb->object_create (object_runtime_handle, > - &object_totem_handle, > - "totem", strlen > ("totem")); > + &object_totem_handle, > + "totem", strlen ("totem")); > objdb->object_create (object_totem_handle, > - &stats->hdr.handle, > - "pg", strlen ("pg")); > + &stats->hdr.handle, > + "pg", strlen ("pg")); > objdb->object_create (stats->hdr.handle, > - > &stats->mrp->hdr.handle, > - "mrp", strlen > ("mrp")); > + &stats->mrp->hdr.handle, > + "mrp", strlen ("mrp")); > objdb->object_create (stats->mrp->hdr.handle, > - > &stats->mrp->srp->hdr.handle, > - "srp", strlen > ("srp")); > + &stats->mrp->srp->hdr.handle, > + "srp", strlen ("srp")); > > objdb->object_key_create_typed (stats->mrp->srp->hdr.handle, > "orf_token_tx", &stats->mrp->srp->orf_token_tx, > @@ -608,7 +608,7 @@ static void corosync_totem_stats_init (void) > sizeof (stats->mrp->srp->memb_join_tx), > OBJDB_VALUETYPE_UINT64); > objdb->object_key_create_typed (stats->mrp->srp->hdr.handle, > "memb_join_rx", &stats->mrp->srp->memb_join_rx, > - sizeof (stats->mrp->srp->memb_join_rx), > OBJDB_VALUETYPE_UINT64); > + sizeof (stats->mrp->srp->memb_join_rx), > OBJDB_VALUETYPE_UINT64); > objdb->object_key_create_typed (stats->mrp->srp->hdr.handle, > "mcast_tx", &stats->mrp->srp->mcast_tx, > sizeof (stats->mrp->srp->mcast_tx), > OBJDB_VALUETYPE_UINT64); > @@ -673,8 +673,8 @@ static void corosync_totem_stats_init (void) > } > /* start stats timer */ > api->timer_add_duration (1500 * MILLI_2_NANO_SECONDS, NULL, > - corosync_totem_stats_updater, > - &corosync_stats_timer_handle); > + corosync_totem_stats_updater, > + &corosync_stats_timer_handle); > > } > > @@ -720,8 +720,8 @@ static void deliver_fn ( > } > > objdb->object_key_increment (service_stats_handle[service][fn_id], > - "rx", > strlen("rx"), > - > &key_incr_dummy); > + "rx", strlen("rx"), > + &key_incr_dummy); > > if (endian_conversion_required) { > > assert(ais_service[service]->exec_engine[fn_id].exec_endian_convert_fn != > NULL); > @@ -756,8 +756,8 @@ int main_mcast ( > > if (ais_service[service]) { > objdb->object_key_increment > (service_stats_handle[service][fn_id], > - "tx", > strlen("tx"), > - > &key_incr_dummy); > + "tx", strlen("tx"), > + &key_incr_dummy); > } > > return (totempg_groups_mcast_joined (corosync_group_handle, iovec, > iov_len, guarantee)); > @@ -946,53 +946,54 @@ static hdb_handle_t corosync_stats_create_connection > (const char* name, > hdb_handle_t object_handle; > > objdb->object_key_increment (object_connection_handle, > - "active", > strlen("active"), > - > &key_incr_dummy); > + "active", strlen("active"), > + &key_incr_dummy); > + > > objdb->object_create (object_connection_handle, > - &object_handle, > - name, > - strlen (name)); > + &object_handle, > + name, > + strlen (name)); > > objdb->object_key_create_typed (object_handle, > - > "service_id", > - > &zero_32, sizeof (zero_32), > - > OBJDB_VALUETYPE_UINT32); > + "service_id", > + &zero_32, sizeof (zero_32), > + OBJDB_VALUETYPE_UINT32); > > objdb->object_key_create_typed (object_handle, > - > "client_pid", > - &pid, > sizeof (pid), > - > OBJDB_VALUETYPE_INT32); > + "client_pid", > + &pid, sizeof (pid), > + OBJDB_VALUETYPE_INT32); > > objdb->object_key_create_typed (object_handle, > - > "responses", > - > &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "responses", > + &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > > objdb->object_key_create_typed (object_handle, > - > "dispatched", > - > &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "dispatched", > + &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > > objdb->object_key_create_typed (object_handle, > - > "requests", > - > &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_INT64); > + "requests", > + &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_INT64); > > objdb->object_key_create_typed (object_handle, > - > "sem_retry_count", > - > &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "sem_retry_count", > + &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > > objdb->object_key_create_typed (object_handle, > - > "send_retry_count", > - > &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "send_retry_count", > + &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > > objdb->object_key_create_typed (object_handle, > - > "recv_retry_count", > - > &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "recv_retry_count", > + &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > > objdb->object_key_create_typed (object_handle, > "flow_control", > @@ -1019,16 +1020,16 @@ static void corosync_stats_destroy_connection > (hdb_handle_t handle) > objdb->object_destroy (handle); > > objdb->object_key_increment (object_connection_handle, > - "closed", > strlen("closed"), > - > &key_incr_dummy); > + "closed", strlen("closed"), > + &key_incr_dummy); > objdb->object_key_decrement (object_connection_handle, > - "active", > strlen("active"), > - > &key_incr_dummy); > + "active", strlen("active"), > + &key_incr_dummy); > } > > static void corosync_stats_update_value (hdb_handle_t handle, > - > const char *name, const void *value, > - > size_t value_len) > + const char *name, const void *value, > + size_t value_len) > { > objdb->object_key_replace (handle, > name, strlen(name), > @@ -1036,7 +1037,7 @@ static void corosync_stats_update_value (hdb_handle_t > handle, > } > > static void corosync_stats_increment_value (hdb_handle_t handle, > - > const char* name) > + const char* name) > { > unsigned int key_incr_dummy; > > @@ -1131,25 +1132,25 @@ static void corosync_stats_init (void) > uint64_t zero_64 = 0; > > objdb->object_find_create (OBJECT_PARENT_HANDLE, > - "runtime", strlen > ("runtime"), > - &object_find_handle); > + "runtime", strlen ("runtime"), > + &object_find_handle); > > if (objdb->object_find_next (object_find_handle, > - > &object_runtime_handle) != 0) { > + &object_runtime_handle) != 0) { > return; > } > > /* Connection objects */ > objdb->object_create (object_runtime_handle, > - &object_connection_handle, > - "connections", strlen > ("connections")); > + &object_connection_handle, > + "connections", strlen ("connections")); > > objdb->object_key_create_typed (object_connection_handle, > - > "active", &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "active", &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > objdb->object_key_create_typed (object_connection_handle, > - > "closed", &zero_64, sizeof (zero_64), > - > OBJDB_VALUETYPE_UINT64); > + "closed", &zero_64, sizeof (zero_64), > + OBJDB_VALUETYPE_UINT64); > } > > > @@ -1395,8 +1396,8 @@ int main (int argc, char **argv) > > /* create the main runtime object */ > objdb->object_create (OBJECT_PARENT_HANDLE, > - &object_runtime_handle, > - "runtime", strlen > ("runtime")); > + &object_runtime_handle, > + "runtime", strlen ("runtime")); > > /* > * Now we are fully initialized. > diff --git a/exec/objdb.c b/exec/objdb.c > index 9c5873e..588f4c0 100644 > --- a/exec/objdb.c > +++ b/exec/objdb.c > @@ -205,9 +205,9 @@ static int _object_notify_deleted_children(struct > object_instance *parent_pt) > if ((tracker_pt != NULL) && > (tracker_pt->object_destroy_notify_fn != NULL)) > > tracker_pt->object_destroy_notify_fn(parent_pt->object_handle, > - > obj_pt->object_name, > - > obj_pt->object_name_len, > - > tracker_pt->data_pt); > + obj_pt->object_name, > + obj_pt->object_name_len, > + tracker_pt->data_pt); > } > } > > @@ -237,9 +237,10 @@ static void object_created_notification( > if (((obj_handle == parent_object_handle) || > (tracker_pt->depth == > OBJECT_TRACK_DEPTH_RECURSIVE)) && > (tracker_pt->object_create_notify_fn != NULL)) { > - > tracker_pt->object_create_notify_fn(object_handle, parent_object_handle, > - > name_pt, name_len, > - > tracker_pt->data_pt); > + > tracker_pt->object_create_notify_fn(object_handle, > + parent_object_handle, > + name_pt, name_len, > + tracker_pt->data_pt); > } > } > > @@ -453,9 +454,9 @@ static int object_create ( > > hdb_handle_put (&object_instance_database, parent_object_handle); > object_created_notification(object_instance->object_handle, > - > object_instance->parent_handle, > - > object_instance->object_name, > - > object_instance->object_name_len); > + object_instance->parent_handle, > + object_instance->object_name, > + object_instance->object_name_len); > objdb_rdunlock(); > return (0); > > @@ -975,9 +976,8 @@ static int object_key_get ( > size_t *value_len) > { > objdb_value_types_t t; > - return object_key_get_typed(object_handle, > - key_name, > - value, value_len, &t); > + return object_key_get_typed (object_handle, > + key_name, value, value_len, &t); > } > > static int object_key_increment ( > @@ -1283,9 +1283,10 @@ static int object_key_replace ( > } > > hdb_handle_put (&object_instance_database, object_handle); > - if (ret == 0) > - object_key_changed_notification(object_handle, key_name, > key_len, > - > new_value, new_value_len, OBJECT_KEY_REPLACED); > + if (ret == 0) { > + object_key_changed_notification (object_handle, key_name, > key_len, > + new_value, new_value_len, OBJECT_KEY_REPLACED); > + } > objdb_rdunlock(); > return (ret); > > @@ -1486,7 +1487,8 @@ static int object_key_iter(hdb_handle_t > parent_object_handle, > objdb_value_types_t t; > int ret; > char *str; > - ret = object_key_iter_typed (parent_object_handle, (char**)key_name, > value, value_len, &t); > + ret = object_key_iter_typed (parent_object_handle, > + (char**)key_name, value, value_len, &t); > str = *key_name; > *key_len = strlen(str); > return ret; > @@ -1600,13 +1602,13 @@ static int object_name_get(hdb_handle_t object_handle, > } > > > -static int object_track_start(hdb_handle_t object_handle, > - object_track_depth_t > depth, > - > object_key_change_notify_fn_t key_change_notify_fn, > - > object_create_notify_fn_t object_create_notify_fn, > - > object_destroy_notify_fn_t object_destroy_notify_fn, > - > object_reload_notify_fn_t object_reload_notify_fn, > - void * priv_data_pt) > +static int object_track_start (hdb_handle_t object_handle, > + object_track_depth_t depth, > + object_key_change_notify_fn_t key_change_notify_fn, > + object_create_notify_fn_t object_create_notify_fn, > + object_destroy_notify_fn_t object_destroy_notify_fn, > + object_reload_notify_fn_t object_reload_notify_fn, > + void * priv_data_pt) > { > struct object_instance *instance; > unsigned int res; > @@ -1638,11 +1640,11 @@ static int object_track_start(hdb_handle_t > object_handle, > return (res); > } > > -static void object_track_stop(object_key_change_notify_fn_t > key_change_notify_fn, > - > object_create_notify_fn_t object_create_notify_fn, > - > object_destroy_notify_fn_t object_destroy_notify_fn, > - > object_reload_notify_fn_t object_reload_notify_fn, > - void * priv_data_pt) > +static void object_track_stop (object_key_change_notify_fn_t > key_change_notify_fn, > + object_create_notify_fn_t object_create_notify_fn, > + object_destroy_notify_fn_t object_destroy_notify_fn, > + object_reload_notify_fn_t object_reload_notify_fn, > + void * priv_data_pt) > { > struct object_instance *instance; > struct object_tracker * tracker_pt = NULL; > diff --git a/exec/totemsrp.c b/exec/totemsrp.c > index a291259..b6f6760 100644 > --- a/exec/totemsrp.c > +++ b/exec/totemsrp.c > @@ -926,17 +926,17 @@ int totemsrp_initialize ( > sizeof (struct message_item)); > > totemsrp_callback_token_create (instance, > - > &instance->token_recv_event_handle, > - > TOTEM_CALLBACK_TOKEN_RECEIVED, > - 0, > - > token_event_stats_collector, > - > instance); > + &instance->token_recv_event_handle, > + TOTEM_CALLBACK_TOKEN_RECEIVED, > + 0, > + token_event_stats_collector, > + instance); > totemsrp_callback_token_create (instance, > - > &instance->token_sent_event_handle, > - > TOTEM_CALLBACK_TOKEN_SENT, > - 0, > - > token_event_stats_collector, > - > instance); > + &instance->token_sent_event_handle, > + TOTEM_CALLBACK_TOKEN_SENT, > + 0, > + token_event_stats_collector, > + instance); > *srp_context = instance; > return (0); >
_______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
