Fix problem with worker name

knizhnik · knizhnik · commit 5b3fc9c796ca · 2015-11-24T23:34:28.000+03:00
diff --git a/contrib/multimaster/multimaster.h b/contrib/multimaster/multimaster.h
@@ -2,8 +2,8 @@
 #define __MULTIMASTER_H__
 
 #define XTM_TRACE(fmt, ...)
-#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
-//#define XTM_INFO(fmt, ...)
+//#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+#define XTM_INFO(fmt, ...)
 
 extern int  MMStartReceivers(char* nodes, int node_id);
 extern void MMBeginTransaction(void);
diff --git a/contrib/multimaster/receiver_raw.c b/contrib/multimaster/receiver_raw.c
@@ -52,6 +52,7 @@ static int receiver_idle_time = 1;
 static bool receiver_sync_mode = true;
 
 /* Worker name */
+static char *worker_name = "multimaster";
 char worker_proc[16];
 
 /* Lastly written positions */
@@ -239,7 +240,7 @@ receiver_raw_main(Datum main_arg)
 
 	query = createPQExpBuffer();
 
-    appendPQExpBuffer(query, "CREATE_REPLICATION_SLOT \"%s\" LOGICAL \"%s\"", args->receiver_slot, worker_proc);
+    appendPQExpBuffer(query, "CREATE_REPLICATION_SLOT \"%s\" LOGICAL \"%s\"", args->receiver_slot, worker_name);
     res = PQexec(conn, query->data);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
diff --git a/contrib/multimaster/tests/dtmbench.cpp b/contrib/multimaster/tests/dtmbench.cpp
@@ -253,7 +253,7 @@ int main (int argc, char* argv[])
         cfg.nReaders,
         cfg.nWriters,
         nAborts,
-        (int)(nAborts*100/cfg.nWriters),
+        (int)(nAborts*100/cfg.nIterations),
         cfg.nAccounts,
         cfg.nIterations,
         cfg.connections.size()
