Signed-off-by: Angus Salkeld <asalk...@redhat.com>
---
exec/main.c | 38 -----------------------
exec/objdb.c | 96 ----------------------------------------------------------
2 files changed, 0 insertions(+), 134 deletions(-)
diff --git a/exec/main.c b/exec/main.c
index c24b304..7778454 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -106,8 +106,6 @@ static int sched_priority = 0;
static unsigned int service_count = 32;
-static qb_thread_lock_t *serialize_lock_f;
-
static struct totem_logging_configuration totem_logging_configuration;
static int num_config_modules;
@@ -132,8 +130,6 @@ static corosync_timer_handle_t corosync_stats_timer_handle;
static const char *corosync_lock_file = LOCALSTATEDIR"/run/corosync.pid";
-static void serialize_unlock (void);
-
qb_loop_t *corosync_poll_handle_get (void)
{
return (corosync_poll_handle);
@@ -152,13 +148,6 @@ void corosync_state_dump (void)
static void unlink_all_completed (void)
{
- /*
- * The schedwrk_do API takes the global serializer lock
- * but doesn't release it because this exit callback is called
- * before it finishes. Since we know we are exiting, we unlock it
- * here
- */
- serialize_unlock ();
api->timer_delete (corosync_stats_timer_handle);
qb_loop_stop (corosync_poll_handle);
totempg_finalize ();
@@ -216,12 +205,10 @@ static struct totempg_group corosync_group = {
static void serialize_lock (void)
{
- qb_thread_lock (serialize_lock_f);
}
static void serialize_unlock (void)
{
- qb_thread_unlock (serialize_lock_f);
}
static void corosync_sync_completed (void)
@@ -393,7 +380,6 @@ static void confchg_fn (
}
sync_in_process = 1;
cs_ipcs_sync_state_changed(sync_in_process);
- serialize_lock ();
memcpy (&corosync_ring_id, ring_id, sizeof (struct memb_ring_id));
for (i = 0; i < left_list_entries; i++) {
@@ -413,7 +399,6 @@ static void confchg_fn (
joined_list, joined_list_entries, ring_id);
}
}
- serialize_unlock ();
if (abort_activate) {
sync_v2_abort ();
@@ -777,21 +762,17 @@ static void deliver_fn (
service = id >> 16;
fn_id = id & 0xffff;
- serialize_lock();
-
if (ais_service[service] == NULL && service == EVT_SERVICE) {
evil_deliver_fn (nodeid, service, fn_id, msg,
endian_conversion_required);
}
if (!ais_service[service]) {
- serialize_unlock();
return;
}
if (fn_id >= ais_service[service]->exec_engine_count) {
log_printf(LOGSYS_LEVEL_WARNING, "discarded unknown message %d
for service %d (max id %d)",
fn_id, service,
ais_service[service]->exec_engine_count);
- serialize_unlock();
return;
}
@@ -807,8 +788,6 @@ static void deliver_fn (
ais_service[service]->exec_engine[fn_id].exec_handler_fn
(msg, nodeid);
-
- serialize_unlock();
}
void main_get_config_modules(struct config_iface_ver0 ***modules, int *num)
@@ -885,24 +864,9 @@ int corosync_sending_allowed (
sending_allowed = QB_TRUE;
} else if (pd->reserved_msgs && sync_in_process == 0) {
sending_allowed = QB_TRUE;
- } else {
- log_printf(LOGSYS_LEVEL_NOTICE,
- "no tx: (have quorum) (FC req) reserved:%d
sync:%d",
- pd->reserved_msgs, sync_in_process);
}
- } else {
- log_printf(LOGSYS_LEVEL_NOTICE, "no tx: not quorate!");
}
-/*
- sending_allowed =
- (corosync_quorum_is_quorate() == 1 ||
- ais_service[service]->allow_inquorate ==
CS_LIB_ALLOW_INQUORATE) &&
- ((ais_service[service]->lib_engine[id].flow_control ==
CS_LIB_FLOW_CONTROL_NOT_REQUIRED) ||
- ((ais_service[service]->lib_engine[id].flow_control ==
CS_LIB_FLOW_CONTROL_REQUIRED) &&
- (pd->reserved_msgs) &&
- (sync_in_process == 0)));
-*/
return (sending_allowed);
}
@@ -1179,8 +1143,6 @@ int main (int argc, char **argv, char **envp)
hdb_handle_t object_runtime_handle;
enum e_ais_done flock_err;
- serialize_lock_f = qb_thread_lock_create (QB_THREAD_LOCK_SHORT);
-
/* default configuration
*/
background = 1;
diff --git a/exec/objdb.c b/exec/objdb.c
index d77c8d9..f638033 100644
--- a/exec/objdb.c
+++ b/exec/objdb.c
@@ -102,23 +102,11 @@ struct object_find_instance {
struct objdb_iface_ver0 objdb_iface;
struct list_head objdb_trackers_head;
-static pthread_mutex_t objdb_mutex;
-static pthread_mutexattr_t objdb_mutex_attr;
DECLARE_HDB_DATABASE (object_instance_database,NULL);
DECLARE_HDB_DATABASE (object_find_instance_database,NULL);
-static void objdb_lock(void)
-{
- pthread_mutex_lock(&objdb_mutex);
-}
-
-static void objdb_unlock(void)
-{
- pthread_mutex_unlock(&objdb_mutex);
-}
-
static int objdb_init (void)
{
hdb_handle_t handle;
@@ -149,11 +137,6 @@ static int objdb_init (void)
list_init (&instance->track_head);
list_init (&objdb_trackers_head);
- pthread_mutexattr_init(&objdb_mutex_attr);
-
- pthread_mutexattr_settype(&objdb_mutex_attr, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&objdb_mutex, &objdb_mutex_attr);
-
hdb_handle_put (&object_instance_database, handle);
return (0);
@@ -370,7 +353,6 @@ static int object_create (
int found = 0;
int i;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
parent_object_handle, (void *)&parent_instance);
if (res != 0) {
@@ -444,7 +426,6 @@ static int object_create (
object_instance->object_handle,
object_instance->object_name,
object_instance->object_name_len);
- objdb_unlock();
return (0);
error_put_destroy:
@@ -457,7 +438,6 @@ error_object_put:
hdb_handle_put (&object_instance_database, parent_object_handle);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -468,8 +448,6 @@ static int object_priv_set (
int res;
struct object_instance *object_instance;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&object_instance);
if (res != 0) {
@@ -479,11 +457,9 @@ static int object_priv_set (
object_instance->priv = priv;
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -504,8 +480,6 @@ static int object_key_create_typed(
size_t expected_size;
int test_size_by_type = CS_TRUE;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -624,7 +598,6 @@ static int object_key_create_typed(
object_key_changed_notification(object_handle, key_name, key_len,
value, value_len, OBJECT_KEY_CREATED);
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
error_put_key:
@@ -637,7 +610,6 @@ error_put:
hdb_handle_put (&object_instance_database, object_handle);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -727,12 +699,9 @@ static int object_destroy (
struct object_instance *instance;
unsigned int res;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
- objdb_unlock();
return (res);
}
@@ -749,7 +718,6 @@ static int object_destroy (
hdb_handle_put (&object_instance_database, object_handle);
hdb_handle_destroy (&object_instance_database, object_handle);
- objdb_unlock();
return (res);
}
@@ -761,7 +729,6 @@ static int object_valid_set (
struct object_instance *instance;
unsigned int res;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -773,11 +740,9 @@ static int object_valid_set (
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -789,7 +754,6 @@ static int object_key_valid_set (
struct object_instance *instance;
unsigned int res;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -801,11 +765,9 @@ static int object_key_valid_set (
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -822,7 +784,6 @@ static int object_find_create (
struct object_instance *object_instance;
struct object_find_instance *object_find_instance;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&object_instance);
if (res != 0) {
@@ -848,7 +809,6 @@ static int object_find_create (
hdb_handle_put (&object_instance_database, object_handle);
hdb_handle_put (&object_find_instance_database, *object_find_handle);
- objdb_unlock();
return (0);
error_destroy:
@@ -858,7 +818,6 @@ error_put:
hdb_handle_put (&object_instance_database, object_handle);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -872,7 +831,6 @@ static int object_find_next (
struct list_head *list;
unsigned int found = 0;
- objdb_lock();
res = hdb_handle_get (&object_find_instance_database,
object_find_handle, (void *)&object_find_instance);
if (res != 0) {
@@ -903,11 +861,9 @@ static int object_find_next (
*object_handle = object_instance->object_handle;
res = 0;
}
- objdb_unlock();
return (res);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -917,7 +873,6 @@ static int object_find_destroy (
struct object_find_instance *object_find_instance;
unsigned int res;
- objdb_lock();
res = hdb_handle_get (&object_find_instance_database,
object_find_handle, (void *)&object_find_instance);
if (res != 0) {
@@ -926,11 +881,9 @@ static int object_find_destroy (
hdb_handle_put(&object_find_instance_database, object_find_handle);
hdb_handle_destroy(&object_find_instance_database, object_find_handle);
- objdb_unlock();
return (0);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -948,7 +901,6 @@ static int object_key_get_typed (
int found = 0;
size_t key_len = strlen(key_name);
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -977,11 +929,9 @@ static int object_key_get_typed (
}
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (res);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1025,7 +975,6 @@ static int object_key_increment (
struct list_head *list;
int found = 0;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -1091,11 +1040,9 @@ static int object_key_increment (
object_key_changed_notification (object_handle, key_name,
key_len,
object_key->value, object_key->value_len,
OBJECT_KEY_REPLACED);
}
- objdb_unlock();
return (res);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1111,7 +1058,6 @@ static int object_key_decrement (
struct list_head *list;
int found = 0;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -1178,11 +1124,9 @@ static int object_key_decrement (
object_key_changed_notification (object_handle, key_name,
key_len,
object_key->value, object_key->value_len,
OBJECT_KEY_REPLACED);
}
- objdb_unlock();
return (res);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1198,7 +1142,6 @@ static int object_key_delete (
struct list_head *list;
int found = 0;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -1231,11 +1174,9 @@ static int object_key_delete (
object_key_changed_notification(object_handle, key_name,
key_len,
NULL, 0, OBJECT_KEY_DELETED);
}
- objdb_unlock();
return (ret);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1254,8 +1195,6 @@ static int object_key_replace (
int found = 0;
int value_changed = 0;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -1338,13 +1277,11 @@ static int object_key_replace (
object_key_changed_notification (object_handle, key_name,
key_len,
new_value, new_value_len, OBJECT_KEY_REPLACED);
}
- objdb_unlock();
return (ret);
error_put:
hdb_handle_put (&object_instance_database, object_handle);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1355,7 +1292,6 @@ static int object_priv_get (
int res;
struct object_instance *object_instance;
- objdb_unlock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&object_instance);
if (res != 0) {
@@ -1365,11 +1301,9 @@ static int object_priv_get (
*priv = object_instance->priv;
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1463,8 +1397,6 @@ static int object_key_iter_reset(hdb_handle_t
object_handle)
unsigned int res;
struct object_instance *instance;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
@@ -1473,11 +1405,9 @@ static int object_key_iter_reset(hdb_handle_t
object_handle)
instance->iter_key_list = &instance->key_head;
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1493,8 +1423,6 @@ static int object_key_iter_typed (hdb_handle_t
parent_object_handle,
struct list_head *list;
unsigned int found = 0;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
parent_object_handle, (void *)&instance);
if (res != 0) {
@@ -1520,11 +1448,9 @@ static int object_key_iter_typed (hdb_handle_t
parent_object_handle,
}
hdb_handle_put (&object_instance_database, parent_object_handle);
- objdb_unlock();
return (res);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1560,8 +1486,6 @@ static int object_key_iter_from(hdb_handle_t
parent_object_handle,
struct list_head *list;
unsigned int found = 0;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
parent_object_handle, (void *)&instance);
if (res != 0) {
@@ -1594,11 +1518,9 @@ static int object_key_iter_from(hdb_handle_t
parent_object_handle,
}
hdb_handle_put (&object_instance_database, parent_object_handle);
- objdb_unlock();
return (res);
error_exit:
- objdb_unlock();
return (-1);
}
@@ -1609,12 +1531,9 @@ static int object_parent_get(hdb_handle_t object_handle,
struct object_instance *instance;
unsigned int res;
- objdb_lock();
-
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
- objdb_unlock();
return (res);
}
@@ -1624,7 +1543,6 @@ static int object_parent_get(hdb_handle_t object_handle,
*parent_handle = instance->parent_handle;
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
}
@@ -1636,11 +1554,9 @@ static int object_name_get(hdb_handle_t object_handle,
struct object_instance *instance;
unsigned int res;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
- objdb_unlock();
return (res);
}
@@ -1648,7 +1564,6 @@ static int object_name_get(hdb_handle_t object_handle,
*object_name_len = instance->object_name_len;
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (0);
}
@@ -1747,11 +1662,9 @@ static int object_dump(hdb_handle_t object_handle,
struct object_instance *instance;
unsigned int res;
- objdb_lock();
res = hdb_handle_get (&object_instance_database,
object_handle, (void *)&instance);
if (res != 0) {
- objdb_unlock();
return (res);
}
@@ -1759,7 +1672,6 @@ static int object_dump(hdb_handle_t object_handle,
hdb_handle_put (&object_instance_database, object_handle);
- objdb_unlock();
return (res);
}
@@ -1772,18 +1684,14 @@ static int object_write_config(const char
**error_string)
main_get_config_modules(&modules, &num_modules);
- objdb_lock();
-
for (i=0; i<num_modules; i++) {
if (modules[i]->config_writeconfig) {
res = modules[i]->config_writeconfig(&objdb_iface,
error_string);
if (res) {
- objdb_unlock();
return res;
}
}
}
- objdb_unlock();
return 0;
}
@@ -1797,19 +1705,15 @@ static int object_reload_config(int flush, const char
**error_string)
main_get_config_modules(&modules, &num_modules);
object_reload_notification(OBJDB_RELOAD_NOTIFY_START, flush);
- objdb_lock();
-
for (i=0; i<num_modules; i++) {
if (modules[i]->config_reloadconfig) {
res = modules[i]->config_reloadconfig(&objdb_iface,
flush, error_string);
if (res) {
object_reload_notification(OBJDB_RELOAD_NOTIFY_FAILED, flush);
- objdb_unlock();
return res;
}
}
}
- objdb_unlock();
object_reload_notification(OBJDB_RELOAD_NOTIFY_END, flush);
return 0;
}
--
1.7.3.1
_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais
