Remove unused alarm functionality

Change-Id: Ifa5f8c05bbb59db042d4df5baff956aab0487408 Reviewed-on: http://review.couchbase.org/26928 Reviewed-by: Trond Norbye <trond.norbye@gmail.com> Tested-by: Trond Norbye <trond.norbye@gmail.com>
membase · Jun 13, 2013 · eb85c8f · eb85c8f
1 parent a8985c3
commit eb85c8f
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 215 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,12 +5,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 
 ADD_LIBRARY(conflate SHARED
-            adhoc_commands.c alarm.c conflate.c kvpair.c logging.c
+            adhoc_commands.c conflate.c kvpair.c logging.c
             persist.c rest.c util.c xmpp.c)
 
 TARGET_LINK_LIBRARIES(conflate curl)
 
-INSTALL (FILES conflate.h alarm.h DESTINATION include/libconflate)
+INSTALL (FILES conflate.h DESTINATION include/libconflate)
 
 INSTALL(TARGETS conflate
   RUNTIME DESTINATION bin
@@ -24,11 +24,5 @@ INSTALL(TARGETS conflate
 ADD_EXECUTABLE(tests/check_kvpair tests/check_kvpair.c tests/test_common.c)
 TARGET_LINK_LIBRARIES(tests/check_kvpair conflate)
 
-ADD_EXECUTABLE(tests/check_alarm tests/check_alarm.c tests/test_common.c)
-TARGET_LINK_LIBRARIES(tests/check_alarm conflate)
-
 ADD_CUSTOM_COMMAND(TARGET tests/check_kvpair POST_BUILD COMMAND
                    tests/check_kvpair)
-
-ADD_CUSTOM_COMMAND(TARGET tests/check_alarm POST_BUILD COMMAND
-                   tests/check_alarm)
diff --git a/Makefile.am b/Makefile.am
@@ -1,15 +1,13 @@
 ACLOCAL_AMFLAGS=-I m4
 lib_LTLIBRARIES = libconflate.la
-pkginclude_HEADERS = conflate.h alarm.h
+pkginclude_HEADERS = conflate.h
 
 EXTRA_DIST=LICENSE.txt README.markdown libconflate.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libconflate.pc
 
 libconflate_la_SOURCES = adhoc_commands.c \
-                         alarm.c \
-                         alarm.h \
                          conflate.c \
                          conflate.h \
                          conflate_convenience.h \
@@ -26,15 +24,10 @@ libconflate_la_LIBADD = $(LTLIBCURL)
 
 test: check
 
-TESTS = tests/check_kvpair tests/check_alarm
+TESTS = tests/check_kvpair
 check_PROGRAMS = $(TESTS)
 
 tests_check_kvpair_SOURCES = tests/check_kvpair.c tests/test_common.c \
                              $(top_builddir)/conflate.h tests/test_common.h
 tests_check_kvpair_DEPENDENCIES = libconflate.la
 tests_check_kvpair_LDADD = libconflate.la
-
-tests_check_alarm_SOURCES = tests/check_alarm.c tests/test_common.c \
-                            $(top_builddir)/alarm.h tests/test_common.h
-tests_check_alarm_DEPENDENCIES = libconflate.la
-tests_check_alarm_LDADD = libconflate.la
diff --git a/alarm.c b/alarm.c
diff --git a/alarm.h b/alarm.h
diff --git a/conflate.c b/conflate.c
@@ -1,4 +1,3 @@
-#include <alarm.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,8 +63,6 @@ bool start_conflate(conflate_config_t conf) {
         conflate_init_commands();
     }
 
-    handle->alarms = init_alarmqueue();
-
     handle->conf = dup_conf(conf);
 
     if (pthread_create(&handle->thread, NULL, run_func, handle) == 0) {

diff --git a/conflate.h b/conflate.h
@@ -50,11 +50,8 @@ typedef struct _conflate_handle conflate_handle_t;
  * \defgroup kvpairs Simple lisp-style Associative Lists
  * \defgroup Logging Logging Facilities
  * \defgroup Persistence Long-Term Persistence API
- * \defgroup Alarm Alarm Functionality
  */
 
-#include "alarm.h"
-
 /**
 * \addtogroup kvpairs
  * @{

diff --git a/conflate_internal.h b/conflate_internal.h
@@ -16,8 +16,6 @@ struct _conflate_handle {
 
     conflate_config_t *conf;
 
-    alarm_queue_t *alarms;
-
     pthread_t thread;
 
     char *url; /* Current URL for debuggability. */

diff --git a/logging.c b/logging.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 #include "conflate.h"
 #include "conflate_internal.h"