Clean-ups

[invirt/third/libt4.git] / rsm_tester.cc

diff --git a/rsm_tester.cc b/rsm_tester.cc
index 1a8b833..5507f80 100644 (file)
--- a/rsm_tester.cc
+++ b/rsm_tester.cc
@@ -6,23 +6,22 @@
 #include "rsm_protocol.h"
 #include "rsmtest_client.h"
 
 #include "rsm_protocol.h"
 #include "rsmtest_client.h"
 

-char log_thread_prefix = 't';
-

 int main(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {

+    global = new t4_state('t');

     if(argc != 4){
     if(argc != 4){

-        cerr << "Usage: " << argv[0] << " [host:]port [partition] arg" << endl;
+        LOG_NONMEMBER << "Usage: " << argv[0] << " [host:]port [partition] arg";

         return 1;
     }
 
     rsmtest_client *lc = new rsmtest_client(argv[1]);
     string command(argv[2]);
     if (command == "partition") {
         return 1;
     }
 
     rsmtest_client *lc = new rsmtest_client(argv[1]);
     string command(argv[2]);
     if (command == "partition") {

-        cout << "net_repair returned " << lc->net_repair(stoi(argv[3]));
+        LOG_NONMEMBER << "net_repair returned " << lc->net_repair(std::stoi(argv[3]));

     } else if (command == "breakpoint") {
     } else if (command == "breakpoint") {

-        int b = stoi(argv[3]);
-        cout << "breakpoint " << b << " returned " << lc->breakpoint(b);
+        int b = std::stoi(argv[3]);
+        LOG_NONMEMBER << "breakpoint " << b << " returned " << lc->breakpoint(b);

     } else {
     } else {

-        cerr << "Unknown command " << argv[2] << endl;
+        LOG_NONMEMBER << "Unknown command " << argv[2];

     }
     return 0;
 }
     }
     return 0;
 }