X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Ferror.cc;h=5afb22824a3c0932bce7ab5e499010345973f34e;hb=a4f7c3b9413014291d0ca549f32455b3be10a6c0;hp=9611ec021edb0d0314d9f31d6ff82873095287a9;hpb=160dac4581fcdf788e9ffb675a51dbb4de8496a1;p=m6w6%2Flibmemcached

diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index 9611ec02..5afb2282 100644
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -35,7 +35,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include <libmemcached/common.h>
+#include <cstdarg>
 
 #define MAX_ERROR_LENGTH 2048
 struct memcached_error_t
@@ -49,87 +50,178 @@ struct memcached_error_t
   char message[MAX_ERROR_LENGTH];
 };
 
-static void _set(memcached_st *memc, memcached_string_t *str, memcached_return_t &rc, int local_errno= 0)
+static void _set(memcached_server_st& server, memcached_st& memc)
 {
-  WATCHPOINT_ASSERT(memc);
-  if (not memc)
+  if (server.error_messages && server.error_messages->query_id != server.root->query_id)
+  {
+    memcached_error_free(server);
+  }
+
+  if (memc.error_messages == NULL)
     return;
 
-  if (memc->error_messages && memc->error_messages->query_id != memc->query_id)
+  memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
+  if (not error) // Bad business if this happens
+    return;
+
+  memcpy(error, memc.error_messages, sizeof(memcached_error_t));
+  error->next= server.error_messages;
+  server.error_messages= error;
+}
+
+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);
   }
 
-  if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE or rc == MEMCACHED_ERRNO)
+  // For memory allocation we use our error since it is a bit more specific
+  if (local_errno == ENOMEM and rc == MEMCACHED_ERRNO)
+  {
+    rc= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  }
+
+  if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE)
+  {
+    local_errno= ENOMEM;
+  }
+
+  if (rc == MEMCACHED_ERRNO and not local_errno)
   {
     local_errno= errno;
     rc= MEMCACHED_ERRNO;
   }
 
-  memcached_error_t *error;
-  error= (struct memcached_error_t *)libmemcached_malloc(memc, sizeof(struct memcached_error_t));
+  if (rc == MEMCACHED_ERRNO and local_errno == ENOTCONN)
+  {
+    rc= MEMCACHED_CONNECTION_FAILURE;
+  }
 
-  if (not error)
+  if (local_errno == EINVAL)
+  {
+    rc= MEMCACHED_INVALID_ARGUMENTS;
+  }
+
+  if (local_errno == ECONNREFUSED)
+  {
+    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
     return;
 
-  error->root= memc;
-  error->query_id= memc->query_id;
+  error->root= &memc;
+  error->query_id= memc.query_id;
   error->rc= rc;
   error->local_errno= local_errno;
 
-  if (str)
+  const char *errmsg_ptr;
+  char errmsg[MAX_ERROR_LENGTH];
+  errmsg[0]= 0;
+  errmsg_ptr= errmsg;
+
+  if (local_errno)
   {
-    size_t length= str->size > (size_t)MAX_ERROR_LENGTH ? MAX_ERROR_LENGTH : str->size;
-    error->size= length;
-    memcpy(error->message, str->c_str, error->size);
-    error->message[error->size]= 0;
+#ifdef STRERROR_R_CHAR_P
+    errmsg_ptr= strerror_r(local_errno, errmsg, sizeof(errmsg));
+#else
+    strerror_r(local_errno, errmsg, sizeof(errmsg));
+    errmsg_ptr= errmsg;
+#endif
+  }
+
+
+  if (str and str->size and local_errno)
+  {
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s(%s), %.*s -> %s", 
+                               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", 
+                               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", 
+                               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", 
+                               memcached_strerror(&memc, rc), 
+                               int(str->size), str->c_str, at);
   }
   else
   {
-    error->size= 0;
+    error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s -> %s", 
+                               memcached_strerror(&memc, rc), at);
   }
 
-  error->next= memc->error_messages;
-  memc->error_messages= error;
+  error->next= memc.error_messages;
+  memc.error_messages= error;
 }
 
-memcached_return_t memcached_set_error_string(memcached_st *memc, memcached_return_t rc, const char *str, size_t length)
+memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
 {
-  memcached_string_t tmp;
-  tmp.c_str= str;
-  tmp.size= length;
-  return memcached_set_error_message(memc, rc, &tmp);
+  assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
+  memcached_string_t tmp= { str, length };
+  return memcached_set_error(memc, rc, at, tmp);
 }
 
-memcached_return_t memcached_set_error_string(memcached_server_st& self, memcached_return_t rc, const char *str, size_t length)
+memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at, const char *str, size_t length)
 {
-  memcached_string_t tmp;
-  tmp.c_str= str;
-  tmp.size= length;
-  return memcached_set_error_message(self, rc, &tmp);
+  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);
 }
 
-memcached_return_t memcached_set_error_message(memcached_st *memc, memcached_return_t rc, memcached_string_t *str)
+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;
 
-  _set(memc, str, rc);
+  _set(memc, &str, rc, at);
 
   return rc;
 }
 
-memcached_return_t memcached_set_error_message(memcached_server_st& self, memcached_return_t rc, memcached_string_t *str)
+memcached_return_t memcached_set_parser_error(memcached_st& memc,
+                                              const char *at,
+                                              const char *format, ...)
 {
+  va_list args;
+
+  char buffer[BUFSIZ];
+  va_start(args, format);
+  int length= vsnprintf(buffer, sizeof(buffer), format, args);
+  va_end(args);
+
+  return memcached_set_error(memc, MEMCACHED_PARSE_ERROR, at, buffer, length);
+}
+
+memcached_return_t memcached_set_error(memcached_server_st& self, 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");
+  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;
 
   char hostname_port_message[MAX_ERROR_LENGTH];
   int size;
-  if (str and str->size)
+  if (str.size)
   {
     size= snprintf(hostname_port_message, sizeof(hostname_port_message), "%.*s, host: %s:%d",
-                   memcached_string_printf(*str),
+                   memcached_string_printf(str),
                    self.hostname, int(self.port));
   }
   else
@@ -140,13 +232,19 @@ memcached_return_t memcached_set_error_message(memcached_server_st& self, memcac
 
   memcached_string_t error_host= { hostname_port_message, size };
 
-  _set((memcached_st*)self.root, &error_host, rc);
+  if (not self.root)
+    return rc;
+
+  _set(*self.root, &error_host, rc, at);
+  _set(self, (*self.root));
 
   return rc;
 }
 
-memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t 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;
 
@@ -155,47 +253,71 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 
   memcached_string_t error_host= { hostname_port, size};
 
-  _set((memcached_st*)self.root, &error_host, rc);
+  if (not self.root)
+    return rc;
+
+  _set(*self.root, &error_host, rc, at);
+  _set(self, *self.root);
 
   return rc;
 }
 
-memcached_return_t memcached_set_error(memcached_st* self, memcached_return_t rc)
+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;
 
-  _set(self, NULL, rc);
+  _set(self, NULL, rc, at);
 
   return rc;
 }
 
-memcached_return_t memcached_set_error(memcached_st& self, memcached_return_t rc)
+memcached_return_t memcached_set_errno(memcached_st& self, int local_errno, const char *at, const char *str, size_t length)
 {
-  if (memcached_success(rc))
+  memcached_string_t tmp= { str, length };
+  return memcached_set_errno(self, local_errno, at, tmp);
+}
+
+memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errno, const char *at, const char *str, size_t length)
+{
+  memcached_string_t tmp= { str, length };
+  return memcached_set_errno(self, local_errno, at, tmp);
+}
+
+memcached_return_t memcached_set_errno(memcached_st& self, int local_errno, const char *at)
+{
+  if (not local_errno)
     return MEMCACHED_SUCCESS;
 
-  _set(&self, NULL, rc);
+  memcached_return_t rc= MEMCACHED_ERRNO;
+  _set(self, NULL, rc, at, local_errno);
 
   return rc;
 }
 
-memcached_return_t memcached_set_errno(memcached_st *memc, int local_errno, memcached_string_t *str)
+memcached_return_t memcached_set_errno(memcached_st& memc, int local_errno, const char *at, memcached_string_t& str)
 {
+  if (not local_errno)
+    return MEMCACHED_SUCCESS;
+
   memcached_return_t rc= MEMCACHED_ERRNO;
-  _set(memc, str, rc, local_errno);
+  _set(memc, &str, rc, at, local_errno);
 
   return rc;
 }
 
-memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errno, memcached_string_t *str)
+memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errno, const char *at, memcached_string_t& str)
 {
+  if (not local_errno)
+    return MEMCACHED_SUCCESS;
+
   char hostname_port_message[MAX_ERROR_LENGTH];
   int size;
-  if (str and str->size)
+  if (str.size)
   {
     size= snprintf(hostname_port_message, sizeof(hostname_port_message), "%.*s, host: %s:%d",
-                   memcached_string_printf(*str),
+                   memcached_string_printf(str),
                    self.hostname, int(self.port));
   }
   else
@@ -206,9 +328,33 @@ memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errn
 
   memcached_string_t error_host= { hostname_port_message, size };
 
-  self.cached_errno= local_errno; // Store in the actual server
   memcached_return_t rc= MEMCACHED_ERRNO;
-  _set((memcached_st*)self.root, &error_host, rc, local_errno);
+  if (not self.root)
+    return rc;
+
+  _set(*self.root, &error_host, rc, at, local_errno);
+  _set(self, (*self.root));
+
+  return rc;
+}
+
+memcached_return_t memcached_set_errno(memcached_server_st& self, int local_errno, const char *at)
+{
+  if (not local_errno)
+    return MEMCACHED_SUCCESS;
+
+  char hostname_port_message[MAX_ERROR_LENGTH];
+  int size = snprintf(hostname_port_message, sizeof(hostname_port_message), "host: %s:%d",
+                      self.hostname, int(self.port));
+
+  memcached_string_t error_host= { hostname_port_message, size };
+
+  memcached_return_t rc= MEMCACHED_ERRNO;
+  if (not self.root)
+    return rc;
+
+  _set(*self.root, &error_host, rc, at, local_errno);
+  _set(self, (*self.root));
 
   return rc;
 }
@@ -255,13 +401,16 @@ static void _error_free(memcached_error_t *error)
   }
 }
 
-void memcached_error_free(memcached_st *self)
+void memcached_error_free(memcached_st& self)
 {
-  if (not self)
-    return;
+  _error_free(self.error_messages);
+  self.error_messages= NULL;
+}
 
-  _error_free(self->error_messages);
-  self->error_messages= NULL;
+void memcached_error_free(memcached_server_st& self)
+{
+  _error_free(self.error_messages);
+  self.error_messages= NULL;
 }
 
 const char *memcached_last_error_message(memcached_st *memc)
@@ -278,6 +427,23 @@ const char *memcached_last_error_message(memcached_st *memc)
   return memc->error_messages->message;
 }
 
+bool memcached_has_current_error(memcached_st &memc)
+{
+  if (memc.error_messages 
+      and memc.error_messages->query_id == memc.query_id
+      and memcached_failed(memc.error_messages->rc))
+  {
+    return true;
+  }
+
+  return false;
+}
+
+bool memcached_has_current_error(memcached_server_st& server)
+{
+  return memcached_has_current_error(*(server.root));
+}
+
 memcached_return_t memcached_last_error(memcached_st *memc)
 {
   if (not memc)
@@ -299,3 +465,40 @@ int memcached_last_error_errno(memcached_st *memc)
 
   return memc->error_messages->local_errno;
 }
+
+const char *memcached_server_error(memcached_server_instance_st server)
+{
+  if (not server)
+    return memcached_strerror(server->root, MEMCACHED_INVALID_ARGUMENTS);
+
+  if (not server->error_messages)
+    return memcached_strerror(server->root, MEMCACHED_SUCCESS);
+
+  if (not server->error_messages->size)
+    return memcached_strerror(server->root, server->error_messages->rc);
+
+  return server->error_messages->message;
+}
+
+
+memcached_error_t *memcached_error_copy(const memcached_server_st& server)
+{
+  if (not server.error_messages)
+    return NULL;
+
+  memcached_error_t *error= (memcached_error_t *)libmemcached_malloc(server.root, sizeof(memcached_error_t));
+  memcpy(error, server.error_messages, sizeof(memcached_error_t));
+  error->next= NULL;
+
+  return error;
+}
+
+memcached_return_t memcached_server_error_return(memcached_server_instance_st ptr)
+{
+  if (ptr and ptr->error_messages)
+  {
+    return ptr->error_messages->rc;
+  }
+
+  return MEMCACHED_FAILURE;
+}