X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Ferror.cc;h=b2af961a6364b36b9f2662fba7bdb3f47c40edc3;hb=09b4ff9a9b7c62b4511ab10c9305eba757fea34b;hp=afb606451fefcfba19b89bc21743f11996cf7ef4;hpb=d2e05058ca75cce6575dd2ee49e7743200581955;p=m6w6%2Flibmemcached

diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index afb60645..b2af961a 100644
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -58,20 +58,27 @@ static void _set(memcached_server_st& server, memcached_st& memc)
   }
 
   if (memc.error_messages == NULL)
+  {
     return;
+  }
 
-  memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
-  if (not error) // Bad business if this happens
+  memcached_error_t *error= libmemcached_xmalloc(&memc, memcached_error_t);
+  if (error == NULL) // Bad business if this happens
+  {
     return;
+  }
 
   memcpy(error, memc.error_messages, sizeof(memcached_error_t));
   error->next= server.error_messages;
   server.error_messages= error;
 }
 
+#if 0
+static int error_log_fd= -1;
+#endif
+
 static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t &rc, const char *at, int local_errno= 0)
 {
-  (void)at;
   if (memc.error_messages && memc.error_messages->query_id != memc.query_id)
   {
     memcached_error_free(memc);
@@ -109,9 +116,11 @@ static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t
     rc= MEMCACHED_CONNECTION_FAILURE;
   }
 
-  memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
-  if (not error) // Bad business if this happens
+  memcached_error_t *error= libmemcached_xmalloc(&memc, memcached_error_t);
+  if (error == NULL) // Bad business if this happens
+  {
     return;
+  }
 
   error->root= &memc;
   error->query_id= memc.query_id;
@@ -136,37 +145,56 @@ static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t
 
   if (str and str->size and local_errno)
   {
-    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s(%s), %.*s -> %s", 
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s(%s), %.*s -> %s", 
+                               long(error->root),
                                memcached_strerror(&memc, rc), 
                                errmsg_ptr,
                                memcached_string_printf(*str), at);
   }
   else if (local_errno)
   {
-    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s(%s) -> %s", 
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s(%s) -> %s", 
+                               long(error->root),
                                memcached_strerror(&memc, rc), 
                                errmsg_ptr,
                                at);
   }
   else if (rc == MEMCACHED_PARSE_ERROR and str and str->size)
   {
-    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%.*s -> %s", 
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %.*s -> %s", 
+                               long(error->root),
                                int(str->size), str->c_str, at);
   }
   else if (str and str->size)
   {
-    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s, %.*s -> %s", 
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s, %.*s -> %s", 
+                               long(error->root),
                                memcached_strerror(&memc, rc), 
                                int(str->size), str->c_str, at);
   }
   else
   {
-    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s -> %s", 
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s -> %s", 
+                               long(error->root),
                                memcached_strerror(&memc, rc), at);
   }
 
   error->next= memc.error_messages;
   memc.error_messages= error;
+
+#if 0
+  if (error_log_fd == -1)
+  {
+//    unlink("/tmp/libmemcachd.log");
+    if ((error_log_fd= open("/tmp/libmemcachd.log", O_CREAT | O_WRONLY | O_APPEND, 0644)) < 0)
+    {
+      perror("open");
+      error_log_fd= -1;
+    }
+  }
+  ::write(error_log_fd, error->message, error->size);
+  ::write(error_log_fd, "\n", 1);
+#endif
 }
 
 memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
@@ -180,6 +208,7 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 {
   assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
   assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
+
   memcached_string_t tmp= { str, length };
   return memcached_set_error(self, rc, at, tmp);
 }
@@ -187,8 +216,10 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, memcached_string_t& str)
 {
   assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
-  if (memcached_success(rc))
-    return MEMCACHED_SUCCESS;
+  if (memcached_fatal(rc) == false)
+  {
+    return rc;
+  }
 
   _set(memc, &str, rc, at);
 
@@ -213,8 +244,10 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 {
   assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
   assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
-  if (memcached_success(rc))
-    return MEMCACHED_SUCCESS;
+  if (memcached_fatal(rc) == false)
+  {
+    return rc;
+  }
 
   char hostname_port_message[MAX_ERROR_LENGTH];
   int size;
@@ -232,29 +265,37 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 
   memcached_string_t error_host= { hostname_port_message, size };
 
-  if (not self.root)
+  assert(self.root);
+  if (self.root == NULL)
+  {
     return rc;
+  }
 
   _set(*self.root, &error_host, rc, at);
   _set(self, (*self.root));
+  assert(self.root->error_messages);
+  assert(self.error_messages);
 
   return rc;
 }
 
 memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at)
 {
-  assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
   assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
-  if (memcached_success(rc))
-    return MEMCACHED_SUCCESS;
+  if (memcached_fatal(rc) == false)
+  {
+    return rc;
+  }
 
   char hostname_port[NI_MAXHOST +NI_MAXSERV + sizeof("host : ")];
   int size= snprintf(hostname_port, sizeof(hostname_port), "host: %s:%d", self.hostname, int(self.port));
 
   memcached_string_t error_host= { hostname_port, size};
 
-  if (not self.root)
+  if (self.root == NULL)
+  {
     return rc;
+  }
 
   _set(*self.root, &error_host, rc, at);
   _set(self, *self.root);
@@ -265,8 +306,10 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 memcached_return_t memcached_set_error(memcached_st& self, memcached_return_t rc, const char *at)
 {
   assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
-  if (memcached_success(rc))
-    return MEMCACHED_SUCCESS;
+  if (memcached_fatal(rc) == false)
+  {
+    return rc;
+  }
 
   _set(self, NULL, rc, at);
 
@@ -287,8 +330,10 @@ memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errn
 
 memcached_return_t memcached_set_errno(memcached_st& self, int local_errno, const char *at)
 {
-  if (not local_errno)
+  if (local_errno == 0)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   memcached_return_t rc= MEMCACHED_ERRNO;
   _set(self, NULL, rc, at, local_errno);
@@ -298,8 +343,10 @@ memcached_return_t memcached_set_errno(memcached_st& self, int local_errno, cons
 
 memcached_return_t memcached_set_errno(memcached_st& memc, int local_errno, const char *at, memcached_string_t& str)
 {
-  if (not local_errno)
+  if (local_errno == 0)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   memcached_return_t rc= MEMCACHED_ERRNO;
   _set(memc, &str, rc, at, local_errno);
@@ -309,8 +356,10 @@ memcached_return_t memcached_set_errno(memcached_st& memc, int local_errno, cons
 
 memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errno, const char *at, memcached_string_t& str)
 {
-  if (not local_errno)
+  if (local_errno == 0)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   char hostname_port_message[MAX_ERROR_LENGTH];
   int size;
@@ -329,8 +378,10 @@ memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errn
   memcached_string_t error_host= { hostname_port_message, size };
 
   memcached_return_t rc= MEMCACHED_ERRNO;
-  if (not self.root)
+  if (self.root == NULL)
+  {
     return rc;
+  }
 
   _set(*self.root, &error_host, rc, at, local_errno);
   _set(self, (*self.root));
@@ -340,8 +391,10 @@ memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errn
 
 memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errno, const char *at)
 {
-  if (not local_errno)
+  if (local_errno == 0)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   char hostname_port_message[MAX_ERROR_LENGTH];
   int size = snprintf(hostname_port_message, sizeof(hostname_port_message), "host: %s:%d",
@@ -350,8 +403,10 @@ memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errn
   memcached_string_t error_host= { hostname_port_message, size };
 
   memcached_return_t rc= MEMCACHED_ERRNO;
-  if (not self.root)
+  if (self.root == NULL)
+  {
     return rc;
+  }
 
   _set(*self.root, &error_host, rc, at, local_errno);
   _set(self, (*self.root));
@@ -361,16 +416,18 @@ memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errn
 
 static void _error_print(const memcached_error_t *error)
 {
-  if (not error)
+  if (error == NULL)
+  {
     return;
+  }
 
-  if (not error->size)
+  if (error->size == 0)
   {
-    fprintf(stderr, "%s\n", memcached_strerror(NULL, error->rc) );
+    fprintf(stderr, "\t%s\n", memcached_strerror(NULL, error->rc) );
   }
   else
   {
-    fprintf(stderr, "%s %s\n", memcached_strerror(NULL, error->rc), error->message);
+    fprintf(stderr, "\t%s %s\n", memcached_strerror(NULL, error->rc), error->message);
   }
 
   _error_print(error->next);
@@ -378,26 +435,37 @@ static void _error_print(const memcached_error_t *error)
 
 void memcached_error_print(const memcached_st *self)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return;
+  }
 
   _error_print(self->error_messages);
+
+  for (uint32_t x= 0; x < memcached_server_count(self); x++)
+  {
+    memcached_server_instance_st instance= memcached_server_instance_by_position(self, x);
+
+    _error_print(instance->error_messages);
+  }
 }
 
 static void _error_free(memcached_error_t *error)
 {
   if (not error)
+  {
     return;
+  }
 
   _error_free(error->next);
 
-  if (error && error->root)
+  if (error and error->root)
   {
     libmemcached_free(error->root, error);
   }
   else if (error)
   {
-    free(error);
+    libmemcached_free(error->root, error);
   }
 }
 
@@ -420,11 +488,15 @@ const char *memcached_last_error_message(memcached_st *memc)
     return memcached_strerror(memc, MEMCACHED_INVALID_ARGUMENTS);
   }
 
-  if (not memc->error_messages)
+  if (memc->error_messages == NULL)
+  {
     return memcached_strerror(memc, MEMCACHED_SUCCESS);
+  }
 
-  if (not memc->error_messages->size)
+  if (memc->error_messages->size == 0)
+  {
     return memcached_strerror(memc, memc->error_messages->rc);
+  }
 
   return memc->error_messages->message;
 }
@@ -453,8 +525,10 @@ memcached_return_t memcached_last_error(memcached_st *memc)
     return MEMCACHED_INVALID_ARGUMENTS;
   }
 
-  if (not memc->error_messages)
+  if (memc->error_messages == NULL)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   return memc->error_messages->rc;
 }
@@ -466,7 +540,7 @@ int memcached_last_error_errno(memcached_st *memc)
     return 0;
   }
 
-  if (not memc->error_messages)
+  if (memc->error_messages == NULL)
   {
     return 0;
   }
@@ -481,11 +555,15 @@ const char *memcached_server_error(memcached_server_instance_st server)
     return NULL;
   }
 
-  if (not server->error_messages)
+  if (server->error_messages == NULL)
+  {
     return memcached_strerror(server->root, MEMCACHED_SUCCESS);
+  }
 
-  if (not server->error_messages->size)
+  if (server->error_messages->size == 0)
+  {
     return memcached_strerror(server->root, server->error_messages->rc);
+  }
 
   return server->error_messages->message;
 }
@@ -498,7 +576,7 @@ memcached_error_t *memcached_error_copy(const memcached_server_st& server)
     return NULL;
   }
 
-  memcached_error_t *error= (memcached_error_t *)libmemcached_malloc(server.root, sizeof(memcached_error_t));
+  memcached_error_t *error= libmemcached_xmalloc(server.root, memcached_error_t);
   memcpy(error, server.error_messages, sizeof(memcached_error_t));
   error->next= NULL;