uclient: use client_t for client id

diff --git a/src/cfuse.cc b/src/cfuse.cc
index 31f0657c83c1c870518fd381e9476e3a9eaad857..514bd3b0a6267860187b8b1d832aa9aed6a2becd 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -87,7 +87,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   // use my argc, argv (make sure you pass a mount point!)
   client->mount();
 
-  _dout_create_courtesy_output_symlink("client", client->get_nodeid());
+  _dout_create_courtesy_output_symlink("client", client->get_nodeid().v);
   cout << "starting fuse" << std::endl;
 
   //cerr << "starting fuse on pid " << getpid() << std::endl;

diff --git a/src/client/Client.h b/src/client/Client.h
index 059482326368aeb13a87ab07328b3b24dcbe6fc5..be0586422f26eb7bd7988a8fbcf3d753053db892 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -751,7 +751,7 @@ public:
  protected:
   MonClient *monclient;
   Messenger *messenger;  
-  int whoami;
+  client_t whoami;
 
   // mds sessions
   map<int, MDSSession> mds_sessions;  // mds -> push seq
@@ -974,7 +974,7 @@ protected:
   ~Client();
   void tear_down_cache();   
 
-  int get_nodeid() { return whoami; }
+  client_t get_nodeid() { return whoami; }
 
   void init();
   void shutdown();

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index 907a8efe494f9557d2ab72f5d021db5ed56557b1..6af0730fba0540c66cf9f94657cf12e72d8e30bf 100644 (file)
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -293,7 +293,7 @@ string SyntheticClient::get_sarg(int seq)
   }
   if (a.length() == 0 || a == "~") {
     char s[20];
-    sprintf(s,"/syn.%d.%d", client->whoami, seq);
+    sprintf(s,"/syn.%d.%d", client->whoami.v, seq);
     a = s;
   } 
   return a;
@@ -342,7 +342,7 @@ int SyntheticClient::run()
          run_only = client->get_nodeid();
           dout(2) << "onlyrange [" << first << ", " << last << ") includes me" << dendl;
        } else
-         run_only = client->get_nodeid()+1;  // not me
+         run_only = client->get_nodeid().v+1;  // not me
       }
       break;
     case SYNCLIENT_MODE_EXCLUDE:
@@ -350,7 +350,7 @@ int SyntheticClient::run()
         exclude = iargs.front();
         iargs.pop_front();
         if (exclude == client->get_nodeid()) {
-         run_only = client->get_nodeid() + 1;
+         run_only = client->get_nodeid().v + 1;
           dout(2) << "not running " << exclude << dendl;
        } else
          run_only = -1;
@@ -391,7 +391,7 @@ int SyntheticClient::run()
         int iarg1 = iargs.front();
         iargs.pop_front();
         if (run_me()) {
-          srand(time(0) + getpid() + client->whoami);
+          srand(time(0) + getpid() + client->whoami.v);
           sleep(rand() % iarg1);
         }
        did_run_me();
@@ -753,7 +753,7 @@ int SyntheticClient::run()
        int playdata = iargs.front(); iargs.pop_front();
         string prefix = get_sarg(0);
        char realtfile[100];
-       sprintf(realtfile, tfile.c_str(), client->get_nodeid());
+       sprintf(realtfile, tfile.c_str(), (int)client->get_nodeid().v);
 
         if (run_me()) {
           dout(-2) << "trace " << tfile << " prefix=" << prefix << " count=" << iarg1 << " data=" << playdata << dendl;
@@ -1735,7 +1735,7 @@ int SyntheticClient::read_dirs(const char *basedir, int dirs, int files, int dep
 
 int SyntheticClient::make_files(int num, int count, int priv, bool more)
 {
-  int whoami = client->get_nodeid();
+  int whoami = client->get_nodeid().v;
   char d[255];
 
   if (priv) {
@@ -1939,7 +1939,7 @@ int SyntheticClient::write_file(string& fn, int size, loff_t wrsize)   // size i
     while ((char*)p < buf + wrsize) {
       *p = (uint64_t)i*(uint64_t)wrsize + (uint64_t)((char*)p - buf);      
       p++;
-      *p = client->get_nodeid();
+      *p = client->get_nodeid().v;
       p++;
     }
 
@@ -1994,7 +1994,7 @@ int SyntheticClient::write_fd(int fd, int size, int wrsize)   // size is in MB,
     while ((char*)p < buf + wrsize) {
       *p = (uint64_t)i*(uint64_t)wrsize + (uint64_t)((char*)p - buf);      
       p++;
-      *p = client->get_nodeid();
+      *p = client->get_nodeid().v;
       p++;
     }
 
@@ -2116,14 +2116,14 @@ int SyntheticClient::create_objects(int nobj, int osize, int inflight)
 
   if (1) {
     // strided
-    start = client->get_nodeid(); //nobjs % numc;
+    start = client->get_nodeid().v; //nobjs % numc;
     inc = numc;
     end = start + nobj;
   } else {
     // segments
-    start = nobj * client->get_nodeid() / numc;
+    start = nobj * client->get_nodeid().v / numc;
     inc = 1;
-    end = nobj * (client->get_nodeid()+1) / numc;
+    end = nobj * (client->get_nodeid().v+1) / numc;
   }
 
   dout(5) << "create_objects " << nobj << " size=" << osize 
@@ -2393,7 +2393,7 @@ int SyntheticClient::read_random(string& fn, int size, int rdsize)   // size is
     while ((char*)p < buf + rdsize) {
       *p = offset*rdsize + (char*)p - buf;      
       p++;
-      *p = client->get_nodeid();
+      *p = client->get_nodeid().v;
       p++;
     }
 
@@ -2570,7 +2570,7 @@ int SyntheticClient::read_random_ex(string& fn, int size, int rdsize)   // size
            while ((char*)p < buf + rdsize) {
              *p = offset*rdsize + (char*)p - buf;      
              p++;
-             *p = client->get_nodeid();
+             *p = client->get_nodeid().v;
              p++;
            }
            

diff --git a/src/client/SyntheticClient.h b/src/client/SyntheticClient.h
index e0b48864f47dddf1cce42360e71bdd9db0f74302..696d4758f1b17649f62c3b831d20f4ed05c14add 100644 (file)
--- a/src/client/SyntheticClient.h
+++ b/src/client/SyntheticClient.h
@@ -189,8 +189,8 @@ class SyntheticClient {
   utime_t run_start;
   utime_t run_until;
 
-  int run_only;
-  int exclude;
+  client_t run_only;
+  client_t exclude;
 
   string get_sarg(int seq);
   int get_iarg() {

diff --git a/src/common/debug.cc b/src/common/debug.cc
index e20b58face6d48dee85b0150749272127a35323f..030ecf204ec71c1e8d51b56be91df3d9eef73e2b 100644 (file)
--- a/src/common/debug.cc
+++ b/src/common/debug.cc
@@ -105,20 +105,20 @@ int _dout_rename_output_file()  // after calling daemon()
   return 0;
 }
 
-int _dout_create_courtesy_output_symlink(const char *type, int n)
+int _dout_create_courtesy_output_symlink(const char *type, __s64 n)
 {
   if (g_conf.log_dir && !g_conf.log_to_stdout) {
     if (_dout_need_open)
       _dout_open_log();
 
-    sprintf(_dout_symlink_path, "%s/%s%d", _dout_symlink_dir, type, n);
+    sprintf(_dout_symlink_path, "%s/%s%lld", _dout_symlink_dir, type, (long long)n);
 
     // rotate out old symlink
     int n = 0;
     while (1) {
       char fn[200];
       struct stat st;
-      sprintf(fn, "%s.%d", _dout_symlink_path, n);
+      sprintf(fn, "%s.%lld", _dout_symlink_path, (long long)n);
       if (::stat(fn, &st) != 0)
        break;
       n++;
@@ -126,10 +126,10 @@ int _dout_create_courtesy_output_symlink(const char *type, int n)
     while (n >= 0) {
       char a[200], b[200];
       if (n)
-       sprintf(a, "%s.%d", _dout_symlink_path, n-1);
+       sprintf(a, "%s.%lld", _dout_symlink_path, (long long)n-1);
       else
        sprintf(a, "%s", _dout_symlink_path);
-      sprintf(b, "%s.%d", _dout_symlink_path, n);
+      sprintf(b, "%s.%lld", _dout_symlink_path, (long long)n);
       ::rename(a, b);
       dout(0) << "---- renamed symlink " << a << " -> " << b << " ----" << dendl;
       n--;

diff --git a/src/common/debug.h b/src/common/debug.h
index f5e5433a6135b920f98b3136b04fedf4a76a32b7..121340e677407a8cf5fb09312f379616a68319d9 100644 (file)
--- a/src/common/debug.h
+++ b/src/common/debug.h
@@ -22,7 +22,7 @@ extern bool _dout_is_open;
 
 extern void _dout_open_log();
 extern int _dout_rename_output_file();  // after calling daemon()
-extern int _dout_create_courtesy_output_symlink(const char *type, int n);
+extern int _dout_create_courtesy_output_symlink(const char *type, __s64 n);
 
 static inline void _dout_check_log() {
   _dout_lock.Lock();