Fix Trond's email address.

[awesomized/libmemcached] / clients / ms_task.c

diff --git a/clients/ms_task.c b/clients/ms_task.c
index aadc419ebc2eddf9b4ed5b8fd04f55be2f422880..bcd2757c0b0453d6a944b0d59344751a7aa35a5c 100644 (file)
--- a/clients/ms_task.c
+++ b/clients/ms_task.c
@@ -11,8 +11,11 @@
 
 #include "config.h"
 
+#include <inttypes.h>
+
 #include "ms_thread.h"
 #include "ms_setting.h"
+#include "ms_atomic.h"
 
 /* command distribution adjustment cycle */
 #define CMD_DISTR_ADJUST_CYCLE    1000
@@ -23,8 +26,6 @@
                                  * item in the window. This factor shows it.
                                  */
 
-extern __thread ms_thread_t ms_thread;
-
 /* get item from task window */
 static ms_task_item_t *ms_get_cur_opt_item(ms_conn_t *c);
 static ms_task_item_t *ms_get_next_get_item(ms_conn_t *c);
@@ -570,7 +571,7 @@ static void ms_warmup_server(ms_conn_t *c)
     }
     else if (c->precmd.cmd == CMD_SET && c->precmd.retstat != MCD_STORED)
     {
-      printf("key: %lx didn't set success\n", item->key_prefix);
+      printf("key: %" PRIx64 " didn't set success\n", item->key_prefix);
     }
   }
 
@@ -724,7 +725,7 @@ static void ms_update_multi_get_result(ms_conn_t *c)
     /* update get miss counter */
     if (mlget_item->get_miss)
     {
-      __sync_fetch_and_add(&ms_stats.get_misses, 1);
+      atomic_add_size(&ms_stats.get_misses, 1);
     }
 
     /* get nothing from server for this task item */
@@ -740,7 +741,7 @@ static void ms_update_multi_get_result(ms_conn_t *c)
         if (curr_time.tv_sec - item->client_time
             < item->exp_time - EXPIRE_TIME_ERROR)
         {
-          __sync_fetch_and_add(&ms_stats.unexp_unget, 1);
+          atomic_add_size(&ms_stats.unexp_unget, 1);
 
           if (ms_setting.verbose)
           {
@@ -754,7 +755,7 @@ static void ms_update_multi_get_result(ms_conn_t *c)
                     "\n\t<%d expire time verification failed, object "
                     "doesn't expire but can't get it now\n"
                     "\tkey len: %d\n"
-                    "\tkey: %lx %.*s\n"
+                    "\tkey: %" PRIx64 " %.*s\n"
                     "\tset time: %s current time: %s "
                     "diff time: %d expire time: %d\n"
                     "\texpected data len: %d\n"
@@ -778,13 +779,13 @@ static void ms_update_multi_get_result(ms_conn_t *c)
       }
       else
       {
-        __sync_fetch_and_add(&ms_stats.vef_miss, 1);
+        atomic_add_size(&ms_stats.vef_miss, 1);
 
         if (ms_setting.verbose)
         {
           fprintf(stderr, "\n<%d data verification failed\n"
                           "\tkey len: %d\n"
-                          "\tkey: %lx %.*s\n"
+                          "\tkey: %" PRIx64 " %.*s\n"
                           "\texpected data len: %d\n"
                           "\texpected data: %.*s\n"
                           "\treceived data: \n",
@@ -828,7 +829,7 @@ static void ms_update_single_get_result(ms_conn_t *c, ms_task_item_t *item)
   /* update get miss counter */
   if ((c->precmd.cmd == CMD_GET) && c->curr_task.get_miss)
   {
-    __sync_fetch_and_add(&ms_stats.get_misses, 1);
+    atomic_add_size(&ms_stats.get_misses, 1);
   }
 
   /* get nothing from server for this task item */
@@ -845,7 +846,7 @@ static void ms_update_single_get_result(ms_conn_t *c, ms_task_item_t *item)
       if (curr_time.tv_sec - item->client_time
           < item->exp_time - EXPIRE_TIME_ERROR)
       {
-        __sync_fetch_and_add(&ms_stats.unexp_unget, 1);
+        atomic_add_size(&ms_stats.unexp_unget, 1);
 
         if (ms_setting.verbose)
         {
@@ -859,7 +860,7 @@ static void ms_update_single_get_result(ms_conn_t *c, ms_task_item_t *item)
                   "\n\t<%d expire time verification failed, object "
                   "doesn't expire but can't get it now\n"
                   "\tkey len: %d\n"
-                  "\tkey: %lx %.*s\n"
+                  "\tkey: %" PRIx64 " %.*s\n"
                   "\tset time: %s current time: %s "
                   "diff time: %d expire time: %d\n"
                   "\texpected data len: %d\n"
@@ -883,13 +884,13 @@ static void ms_update_single_get_result(ms_conn_t *c, ms_task_item_t *item)
     }
     else
     {
-      __sync_fetch_and_add(&ms_stats.vef_miss, 1);
+      atomic_add_size(&ms_stats.vef_miss, 1);
 
       if (ms_setting.verbose)
       {
         fprintf(stderr, "\n<%d data verification failed\n"
                         "\tkey len: %d\n"
-                        "\tkey: %lx %.*s\n"
+                        "\tkey: %" PRIx64 " %.*s\n"
                         "\texpected data len: %d\n"
                         "\texpected data: %.*s\n"
                         "\treceived data: \n",