Merge trunk revision 2746:

r2746 | asalkeld | 2010-03-30 00:19:25 -0700 (Tue, 30 Mar 2010) | 6 lines

objdb: fix key change notifications

1) don't send notifications if the key is the same.
2) Add key value change notifications to key_inc & key_dec



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2774 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/objdb.c

@@ -1086,6 +1086,10 @@ static int object_key_increment (
 	}
 
 	hdb_handle_put (&object_instance_database, object_handle);
+	if (res == 0) {
+		object_key_changed_notification (object_handle, key_name, key_len,
+			object_key->value, object_key->value_len, OBJECT_KEY_REPLACED);
+	}
 	objdb_rdunlock();
 	return (res);
 
@@ -1169,6 +1173,10 @@ static int object_key_decrement (
 	}
 
 	hdb_handle_put (&object_instance_database, object_handle);
+	if (res == 0) {
+		object_key_changed_notification (object_handle, key_name, key_len,
+			object_key->value, object_key->value_len, OBJECT_KEY_REPLACED);
+	}
 	objdb_rdunlock();
 	return (res);
 
@@ -1243,6 +1251,7 @@ static int object_key_replace (
 	struct object_key *object_key = NULL;
 	struct list_head *list;
 	int found = 0;
+	int value_changed = 0;
 
 	objdb_rdlock();
 
@@ -1307,8 +1316,14 @@ static int object_key_replace (
 			free(object_key->value);
 			object_key->value = replacement_value;
 		}
-		memcpy(object_key->value, new_value, new_value_len);
-		object_key->value_len = new_value_len;
+		if (memcmp (object_key->value, new_value, new_value_len) == 0) {
+			value_changed = 0;
+		}
+		else {
+			memcpy(object_key->value, new_value, new_value_len);
+			object_key->value_len = new_value_len;
+			value_changed = 1;
+		}
 	}
 	else {
 		ret = -1;
@@ -1316,7 +1331,7 @@ static int object_key_replace (
 	}
 
 	hdb_handle_put (&object_instance_database, object_handle);
-	if (ret == 0) {
+	if (ret == 0 && value_changed) {
 		object_key_changed_notification (object_handle, key_name, key_len,
 			new_value, new_value_len, OBJECT_KEY_REPLACED);
 	}