Missed a hdb_handle_t conversion.
Regards
-steve
Index: services/ckpt.c
===================================================================
--- services/ckpt.c (revision 1758)
+++ services/ckpt.c (working copy)
@@ -343,8 +343,6 @@
static int ckpt_sync_process (void);
static void ckpt_sync_abort(void);
-static int nodeid_in_membership (unsigned int nodeid);
-
static void sync_refcount_increment (
struct checkpoint *checkpoint, unsigned int nodeid);
@@ -916,7 +914,7 @@
static void ckpt_checkpoint_remove_cleanup (
void *conn,
- mar_name_t *checkpoint_name,
+ mar_name_t checkpoint_name,
mar_uint32_t ckpt_id)
{
struct list_head *list;
@@ -929,7 +927,7 @@
checkpoint_cleanup = list_entry (list, struct checkpoint_cleanup, list);
if (mar_name_match (&checkpoint_cleanup->checkpoint_name,
- checkpoint_name) &&
+ &checkpoint_name) &&
(checkpoint_cleanup->ckpt_id == ckpt_id)) {
list_del (&checkpoint_cleanup->list);
@@ -2492,7 +2490,7 @@
ckpt_checkpoint_remove_cleanup (
conn,
- &req_lib_ckpt_checkpointclose->checkpoint_name,
+ req_lib_ckpt_checkpointclose->checkpoint_name,
req_lib_ckpt_checkpointclose->ckpt_id);
assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0);
}
@@ -3294,21 +3292,6 @@
/*
* Recovery after network partition or merge
*/
-int nodeid_in_membership (
- unsigned int nodeid)
-{
- unsigned int i;
- int found = 0;
-
- for (i = 0; i < my_member_list_entries; i++) {
- if (nodeid == my_member_list[i]) {
- found = 1;
- break;
- }
- }
- return (found);
-}
-
void sync_refcount_increment (
struct checkpoint *checkpoint,
unsigned int nodeid)
@@ -3360,7 +3343,6 @@
}
if (checkpoint->refcount_set[i].nodeid == nodeid) {
checkpoint->refcount_set[i].refcount -= 1;
-log_printf (LOG_LEVEL_NOTICE, "decrementing node id %d %d\n", nodeid, checkpoint->refcount_set[i].refcount);
break;
}
}
@@ -3872,25 +3854,11 @@
assert (checkpoint != NULL);
for (i = 0; i < PROCESSOR_COUNT_MAX; i++) {
- /*
- * If nodeid is zero, done processing list
- */
if (req_exec_ckpt_sync_checkpoint_refcount->refcount_set[i].nodeid == 0) {
break;
}
-
- /*
- * if nodeid not in membership, check next one
- */
- if (nodeid_in_membership (req_exec_ckpt_sync_checkpoint_refcount->refcount_set[i].nodeid) == 0) {
- continue;
- }
for (j = 0; j < PROCESSOR_COUNT_MAX; j++) {
- /*
- * If new entry in the new checkpoint (nodeid=0) then add it
- */
if (checkpoint->refcount_set[j].nodeid == 0) {
-
checkpoint->refcount_set[j].nodeid =
req_exec_ckpt_sync_checkpoint_refcount->refcount_set[i].nodeid;
checkpoint->refcount_set[j].refcount =
@@ -3901,9 +3869,6 @@
break;
}
- /*
- * If old entry in checkpoint equals messages nodeid, add it to reference count
- */
if (req_exec_ckpt_sync_checkpoint_refcount->refcount_set[i].nodeid == checkpoint->refcount_set[j].nodeid) {
checkpoint->refcount_set[j].refcount +=
req_exec_ckpt_sync_checkpoint_refcount->refcount_set[i].refcount;
Index: Makefile.inc
===================================================================
--- Makefile.inc (revision 1757)
+++ Makefile.inc (working copy)
@@ -59,7 +59,7 @@
# OPENAIS_BUILD can be defined as RELEASE or DEBUG
#
ifndef OPENAIS_BUILD
- OPENAIS_BUILD=RELEASE
+ OPENAIS_BUILD=DEBUG
endif
# OPENAIS_PROFILE
Index: lib/ckpt.c
===================================================================
--- lib/ckpt.c (revision 1758)
+++ lib/ckpt.c (working copy)
@@ -95,7 +95,7 @@
SaSizeT maxSectionIdSize;
struct list_head sectionIdListHead;
pthread_mutex_t response_mutex;
- unsigned int executive_iteration_handle;
+ hdb_handle_t executive_iteration_handle;
struct list_head list;
};
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
