projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
README: Added the pinba plugin and its dependency.
[collectd.git]
/
src
/
memcached.c
diff --git
a/src/memcached.c
b/src/memcached.c
index
3421f82
..
348591f
100644
(file)
--- a/
src/memcached.c
+++ b/
src/memcached.c
@@
-38,6
+38,11
@@
# include <netinet/in.h>
# include <netinet/tcp.h>
# include <netinet/in.h>
# include <netinet/tcp.h>
+/* Hack to work around the missing define in AIX */
+#ifndef MSG_DONTWAIT
+# define MSG_DONTWAIT MSG_NONBLOCK
+#endif
+
#define MEMCACHED_DEF_HOST "127.0.0.1"
#define MEMCACHED_DEF_PORT "11211"
#define MEMCACHED_DEF_HOST "127.0.0.1"
#define MEMCACHED_DEF_PORT "11211"
@@
-67,7
+72,8
@@
static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
memset (&serv_addr, 0, sizeof (serv_addr));
serv_addr.sun_family = AF_UNIX;
memset (&serv_addr, 0, sizeof (serv_addr));
serv_addr.sun_family = AF_UNIX;
- sstrncpy (serv_addr.sun_path, memcached_socket, sizeof (serv_addr.sun_path));
+ sstrncpy (serv_addr.sun_path, memcached_socket,
+ sizeof (serv_addr.sun_path));
/* create our socket descriptor */
fd = socket (AF_UNIX, SOCK_STREAM, 0);
/* create our socket descriptor */
fd = socket (AF_UNIX, SOCK_STREAM, 0);
@@
-80,7
+86,7
@@
static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
/* connect to the memcached daemon */
status = (ssize_t) connect (fd, (struct sockaddr *) &serv_addr,
/* connect to the memcached daemon */
status = (ssize_t) connect (fd, (struct sockaddr *) &serv_addr,
-
SUN_LEN (&
serv_addr));
+
sizeof (
serv_addr));
if (status != 0) {
shutdown (fd, SHUT_RDWR);
close (fd);
if (status != 0) {
shutdown (fd, SHUT_RDWR);
close (fd);
@@
-114,7
+120,7
@@
static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
port = MEMCACHED_DEF_PORT;
}
port = MEMCACHED_DEF_PORT;
}
- if ((ai_return = getaddrinfo (host, port,
NULL
, &ai_list)) != 0) {
+ if ((ai_return = getaddrinfo (host, port,
&ai_hints
, &ai_list)) != 0) {
char errbuf[1024];
ERROR ("memcached: getaddrinfo (%s, %s): %s",
host, port,
char errbuf[1024];
ERROR ("memcached: getaddrinfo (%s, %s): %s",
host, port,