More clean-ups

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

diff --git a/lock_tester.cc b/lock_tester.cc
index b2df781..0204a71 100644 (file)
--- a/lock_tester.cc
+++ b/lock_tester.cc
@@ -26,8 +26,7 @@ void check_grant(lock_protocol::lockid_t lid) {
     lock ml(count_mutex);
     int x = lid[0] & 0x0f;
     if (ct[x] != 0) {
     lock ml(count_mutex);
     int x = lid[0] & 0x0f;
     if (ct[x] != 0) {

-        cout << "error: server granted " << lid << " twice" << endl;
-        cerr << "error: server granted " << lid << " twice" << endl;
+        LOG_NONMEMBER("error: server granted " << lid << " twice");

         exit(1);
     }
     ct[x] += 1;
         exit(1);
     }
     ct[x] += 1;

@@ -37,7 +36,7 @@ void check_release(lock_protocol::lockid_t lid) {
     lock ml(count_mutex);
     int x = lid[0] & 0x0f;
     if (ct[x] != 1) {
     lock ml(count_mutex);
     int x = lid[0] & 0x0f;
     if (ct[x] != 1) {

-        cerr << "error: client released un-held lock " << lid << endl;
+        LOG_NONMEMBER("error: client released un-held lock " << lid);

         exit(1);
     }
     ct[x] -= 1;
         exit(1);
     }
     ct[x] -= 1;

@@ -123,7 +122,7 @@ main(int argc, char *argv[])
     srandom((uint32_t)getpid());
 
     if (argc < 2) {
     srandom((uint32_t)getpid());
 
     if (argc < 2) {

-        cerr << "Usage: " << argv[0] << " [host:]port [test]" << endl;
+        LOG_NONMEMBER("Usage: " << argv[0] << " [host:]port [test]");

         exit(1);
     }
 
         exit(1);
     }