X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/2546a41ad36fdc9ef6471cb35a1d56930ae1b527..d54215aea2a7321ab0f2dc7b0042fea2b7ff5df5:/rsm_tester.cc

diff --git a/rsm_tester.cc b/rsm_tester.cc
index 31b8c1a..469aea2 100644
--- a/rsm_tester.cc
+++ b/rsm_tester.cc
@@ -2,34 +2,27 @@
 // RSM test client
 //
 
+#include "types.h"
 #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>
 
 char log_thread_prefix = 't';
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     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]);
+    string command(argv[2]);
     if (command == "partition") {
-        printf("net_repair returned %d\n", lc->net_repair(atoi(argv[3])));
+        cout << "net_repair returned " << lc->net_repair(stoi(argv[3]));
     } else if (command == "breakpoint") {
-        int b = atoi(argv[3]);
-        printf("breakpoint %d returned %d\n", b, lc->breakpoint(b));
+        int b = stoi(argv[3]);
+        cout << "breakpoint " << b << " returned " << lc->breakpoint(b);
     } else {
-        fprintf(stderr, "Unknown command %s\n", argv[2]);
+        LOG_NONMEMBER("Unknown command " << argv[2]);
     }
     return 0;
 }