Rev 68: merged tridge's fix in http://samba.org/~tridge/psomogyi/

[psomogyi at gamax.hu]

------------------------------------------------------------
revno: 68
revision-id: psomogyi at gamax.hu-20070216142036-ncao1k1fv82ore0u
parent: psomogyi at gamax.hu-20070215160238-zlseuvqsbo9wmdle
parent: tridge at samba.org-20070216034827-uoannnycm4q1aojr
committer: Peter Somogyi <psomogyi at gamax.hu>
branch nick: ctdb
timestamp: Fri 2007-02-16 15:20:36 +0100
message:
  merged tridge's fix
modified:
  ctdb_bench.c                   ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
    ------------------------------------------------------------
    revno: 44.1.16
    merged: tridge at samba.org-20070216034827-uoannnycm4q1aojr
    parent: tridge at samba.org-20070216034145-uya1v207wid64dn6
    committer: Andrew Tridgell <tridge at samba.org>
    branch nick: tridge
    timestamp: Fri 2007-02-16 14:48:27 +1100
    message:
      fixed incr initialisation
    ------------------------------------------------------------
    revno: 44.1.15
    merged: tridge at samba.org-20070216034145-uya1v207wid64dn6
    parent: tridge at samba.org-20070209014616-852f8r8vjlkf1xml
    parent: psomogyi at gamax.hu-20070215160238-zlseuvqsbo9wmdle
    committer: Andrew Tridgell <tridge at samba.org>
    branch nick: tridge
    timestamp: Fri 2007-02-16 14:41:45 +1100
    message:
      merged peters IB work
=== modified file 'ctdb_bench.c'
--- a/ctdb_bench.c	2007-02-09 01:45:58 +0000
+++ b/ctdb_bench.c	2007-02-16 03:48:27 +0000
@@ -149,19 +149,22 @@
 */
 static void bench_ring(struct ctdb_context *ctdb, struct event_context *ev)
 {
-	TDB_DATA data;
-	int incr, vnn=ctdb_get_vnn(ctdb);
-
-	data.dptr = (uint8_t *)&incr;
-	data.dsize = sizeof(incr);
+	int vnn=ctdb_get_vnn(ctdb);
 
 	if (vnn == 0) {
 		/* two messages are injected into the ring, moving
 		   in opposite directions */
-		int dest = (ctdb_get_vnn(ctdb) + incr) % ctdb_get_num_nodes(ctdb);
+		int dest, incr;
+		TDB_DATA data;
+		
+		data.dptr = (uint8_t *)&incr;
+		data.dsize = sizeof(incr);
+
 		incr = 1;
+		dest = (ctdb_get_vnn(ctdb) + incr) % ctdb_get_num_nodes(ctdb);
 		ctdb_send_message(ctdb, dest, 0, data);
 		incr = -1;
+		dest = (ctdb_get_vnn(ctdb) + incr) % ctdb_get_num_nodes(ctdb);
 		ctdb_send_message(ctdb, dest, 0, data);
 	}