X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/eeab3e6cade87c1fe0a5f3d93522e12ccb9ec2ab..ab9eee5d7f1fbe7a3fe6229d4a78136efb14371b:/rsm_tester.cc?ds=sidebyside

diff --git a/rsm_tester.cc b/rsm_tester.cc
index 3ff4733..42aaebe 100644
--- a/rsm_tester.cc
+++ b/rsm_tester.cc
@@ -2,34 +2,24 @@
 // RSM test client
 //
 
-#include "rsm_protocol.h"
-#include "rsmtest_client.h"
-#include "rpc/rpc.h"
-#include <arpa/inet.h>
-#include <vector>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
+#include "include/types.h"
+#include "include/rsm_protocol.h"
+#include "include/rsmtest_client.h"
 
-char tprintf_thread_prefix = 't';
-
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
+    global = new t4_state('t');
     if(argc != 4){
-        fprintf(stderr, "Usage: %s [host:]port [partition] arg\n", argv[0]);
-        exit(1);
+        LOG_NONMEMBER << "Usage: " << argv[0] << " [host:]port [partition] arg";
+        return 1;
     }
 
     rsmtest_client *lc = new rsmtest_client(argv[1]);
-    std::string command(argv[2]);
-    if (command == "partition") {
-        printf("net_repair returned %d\n", lc->net_repair(atoi(argv[3])));
-    } else if (command == "breakpoint") {
-        int b = atoi(argv[3]);
-        printf("breakpoint %d returned %d\n", b, lc->breakpoint(b));
-    } else {
-        fprintf(stderr, "Unknown command %s\n", argv[2]);
-    }
+    string command(argv[2]);
+    if (command == "partition")
+        LOG_NONMEMBER << "net_repair returned " << lc->net_repair(std::stoi(argv[3]));
+    else if (command == "breakpoint")
+        LOG_NONMEMBER << "breakpoint " << argv[3] << " returned " << lc->breakpoint(std::stoi(argv[3]));
+    else
+        LOG_NONMEMBER << "Unknown command " << argv[2];
     return 0;
 }