diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | daemon.c | 2 | ||||
| -rw-r--r-- | memcached.c | 16 | ||||
| -rw-r--r-- | memcached.h | 4 |
5 files changed, 16 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 1faa0c0..a3b54b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,13 +3,13 @@ pkginclude_HEADERS = protocol_binary.h BUILT_SOURCES= @DTRACE_HEADER@ -memcached_SOURCES = memcached.c slabs.c slabs.h items.c items.h assoc.c assoc.h memcached.h thread.c stats.c stats.h +memcached_SOURCES = memcached.c slabs.c slabs.h items.c items.h assoc.c assoc.h memcached.h thread.c stats.c stats.h daemon.c memcached_debug_SOURCES = $(memcached_SOURCES) memcached_CPPFLAGS = -DNDEBUG -memcached_LDADD = @DTRACE_OBJ@ @DAEMON_OBJ@ -memcached_debug_LDADD = @DTRACE_DEBUG_OBJ@ @DAEMON_OBJ@ -memcached_DEPENDENCIES = @DTRACE_OBJ@ @DAEMON_OBJ@ -memcached_debug_DEPENDENCIES = @DTRACE_DEBUG_OBJ@ @DAEMON_OBJ@ +memcached_LDADD = @DTRACE_OBJ@ +memcached_debug_LDADD = @DTRACE_DEBUG_OBJ@ +memcached_DEPENDENCIES = @DTRACE_OBJ@ +memcached_debug_DEPENDENCIES = @DTRACE_DEBUG_OBJ@ memcached_dtrace.h: memcached_dtrace.d ${DTRACE} -h -s memcached_dtrace.d @@ -25,7 +25,7 @@ memcached_debug_dtrace.o: $(memcached_debug_OBJECTS) SUBDIRS = doc DIST_DIRS = scripts -EXTRA_DIST = doc scripts TODO t memcached.spec daemon.c memcached_dtrace.d +EXTRA_DIST = doc scripts TODO t memcached.spec memcached_dtrace.d test: memcached-debug prove $(srcdir)/t diff --git a/configure.ac b/configure.ac index 247e04d..acd7e53 100644 --- a/configure.ac +++ b/configure.ac @@ -141,9 +141,6 @@ AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(mallinfo, malloc) -AC_CHECK_FUNC(daemon,AC_DEFINE([HAVE_DAEMON],,[Define this if you have daemon()]),[DAEMON_OBJ=daemon.o]) -AC_SUBST(DAEMON_OBJ) - AC_HEADER_STDBOOL AC_C_CONST AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) @@ -40,7 +40,7 @@ #include "memcached.h" -int daemon(int nochdir, int noclose) +int daemonize(int nochdir, int noclose) { int fd; diff --git a/memcached.c b/memcached.c index 30acd7e..c6205e5 100644 --- a/memcached.c +++ b/memcached.c @@ -1936,8 +1936,8 @@ static char *server_stats(bool binprot, int *buflen) { pos += sprintf(pos, "STAT version " VERSION "\r\n"); pos += sprintf(pos, "STAT pointer_size %d\r\n", (int)(8 * sizeof(void *))); #ifndef WIN32 - pos += sprintf(pos, "STAT rusage_user %ld.%06ld\r\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec); - pos += sprintf(pos, "STAT rusage_system %ld.%06ld\r\n", usage.ru_stime.tv_sec, usage.ru_stime.tv_usec); + pos += sprintf(pos, "STAT rusage_user %ld.%06ld\r\n", (long)usage.ru_utime.tv_sec, (long)usage.ru_utime.tv_usec); + pos += sprintf(pos, "STAT rusage_system %ld.%06ld\r\n", (long)usage.ru_stime.tv_sec, (long)usage.ru_stime.tv_usec); #endif /* !WIN32 */ pos += sprintf(pos, "STAT curr_connections %u\r\n", stats.curr_conns - 1); /* ignore listening conn */ pos += sprintf(pos, "STAT total_connections %u\r\n", stats.total_conns); @@ -3782,7 +3782,7 @@ static int enable_large_pages(void) { int main (int argc, char **argv) { int c; bool lock_memory = false; - bool daemonize = false; + bool do_daemonize = false; bool preallocate = false; int maxcore = 0; char *username = NULL; @@ -3847,7 +3847,7 @@ int main (int argc, char **argv) { settings.inter= strdup(optarg); break; case 'd': - daemonize = true; + do_daemonize = true; break; case 'r': maxcore = 1; @@ -3955,9 +3955,9 @@ int main (int argc, char **argv) { /* daemonize if requested */ /* if we want to ensure our ability to dump core, don't chdir to / */ - if (daemonize) { + if (do_daemonize) { int res; - res = daemon(maxcore, settings.verbose); + res = daemonize(maxcore, settings.verbose); if (res == -1) { fprintf(stderr, "failed to daemon() in order to daemonize\n"); return 1; @@ -4020,7 +4020,7 @@ int main (int argc, char **argv) { thread_init(settings.num_threads, main_base); /* save the PID in if we're a daemon, do this after thread_init due to a file descriptor handling bug somewhere in libevent */ - if (daemonize) + if (do_daemonize) save_pid(getpid(), pid_file); /* initialise clock event */ clock_handler(0, 0, 0); @@ -4069,7 +4069,7 @@ int main (int argc, char **argv) { /* enter the event loop */ event_base_loop(main_base, 0); /* remove the PID file if we're a daemon */ - if (daemonize) + if (do_daemonize) remove_pidfile(pid_file); /* Clean up strdup() call for bind() address */ if (settings.inter) diff --git a/memcached.h b/memcached.h index ded31e4..03cadbd 100644 --- a/memcached.h +++ b/memcached.h @@ -284,10 +284,8 @@ uint32_t append_bin_stats(char *buf, const char *key, const uint16_t klen, const char *val, const uint32_t vlen); uint32_t append_ascii_stats(char *buf, const char *key, const uint16_t klen, const char *val, const uint32_t vlen); +extern int daemonize(int nochdir, int noclose); -#ifndef HAVE_DAEMON -extern int daemon(int nochdir, int noclose); -#endif #include "stats.h" #include "slabs.h" |