Merge pull request #1 from tempodb/tempodb_config

Tempodb config

Author: myagley

.gitignore

@@ -1,5 +1,11 @@
-TempoDb_CppUTest_tests
-libTempoDb_CppUTest.a
-objs/
+tempodb_tests
+tempodb_tests.txt
+lib/libtempodb.a
+lib/test/libtempodb.a
+objs/*
 a.out
 examples/example-authed.c
+CppUTest/CppUTest_tests
+CppUTest/lib/libCppUTest.a
+CppUTest/lib/libCppUTestExt.a
+CppUTest/objs

.travis.yml

@@ -1,5 +1,4 @@
 language: cpp
 compiler:
   - gcc
-  - clang
-script: make
+script: cd CppUTest && make && echo "Done building CppUTest" && cd .. && pwd && make vtest

CppUTest/CppUTest_tests

@@ -1,5 +1,5 @@
 #Set this to @ to keep the makefile quiet
-SILENCE = @
+#SILENCE = @
 
 #--- Inputs ----#
 COMPONENT_NAME = CppUTest
@@ -17,6 +17,10 @@ TEST_SRC_DIRS = \
 INCLUDE_DIRS =\
   include
 
+CPPUTEST_LIB_DIR = lib
+
+CPPUTEST_WARNINGFLAGS = NONE
+
 include $(CPPUTEST_HOME)/build/MakefileWorker.mk
 
 #these are a sample of the other alternative flag settings

CppUTest/Makefile

@@ -90,12 +90,12 @@ endif
 
 # Default dir for temporary files (d, o)
 ifndef CPPUTEST_OBJS_DIR
-    CPPUTEST_OBJS_DIR = objs
+    CPPUTEST_OBJS_DIR = objs/test
 endif
 
 # Default dir for the outout library
 ifndef CPPUTEST_LIB_DIR
-    CPPUTEST_LIB_DIR = lib
+    CPPUTEST_LIB_DIR = lib/test
 endif
 
 # No map by default
@@ -144,7 +144,9 @@ ifeq ($(CPPUTEST_USE_GCOV), Y)
 	CPPUTEST_CPPFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CPPUTEST_CPPFLAGS += $(CPPUTEST_WARNINGFLAGS)
+ifneq ($(CPPUTEST_WARNINGFLAGS), NONE)
+  CPPUTEST_CPPFLAGS += $(CPPUTEST_WARNINGFLAGS)
+endif
 CPPUTEST_CXXFLAGS += $(CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE)
 CPPUTEST_CFLAGS += $(CPPUTEST_MEMLEAK_DETECTOR_MALLOC_MACRO_FILE)
 
@@ -251,12 +253,8 @@ LDFLAGS = $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
 
 # Targets
 
-.PHONY: all
-all: start $(TEST_TARGET)  
-	$(RUN_TEST_TARGET)	
-
 .PHONY: start
-start: $(TEST_TARGET) 
+start: $(TEST_TARGET)
 	$(SILENCE)START_TIME=$(call time)
 
 .PHONY: all_no_tests
@@ -290,10 +288,10 @@ $(TARGET_LIB): $(OBJ)
 	$(SILENCE)ranlib $@
 
 test: $(TEST_TARGET)
-	$(RUN_TEST_TARGET) | tee $(TEST_OUTPUT)
+	$(RUN_TEST_TARGET)
 
 vtest: $(TEST_TARGET)
-	$(RUN_TEST_TARGET) -v  | tee $(TEST_OUTPUT)
+	$(RUN_TEST_TARGET) -v
 
 $(CPPUTEST_OBJS_DIR)/%.o: %.cpp
 	@echo compiling $(notdir $<)

CppUTest/build/MakefileWorker.mk

@@ -4,7 +4,7 @@
 SILENCE = @
 
 #---- Outputs ----#
-COMPONENT_NAME = TempoDb_CppUTest
+COMPONENT_NAME = tempodb
 
 #--- Inputs ----#
 CPPUTEST_HOME = CppUTest
@@ -17,7 +17,7 @@ SRC_DIRS = \
 TEST_SRC_DIRS = \
 	.\
 	mocks\
-	tests/tempodb\
+	tests/TempoDb\
 	tests\
 
 
@@ -35,4 +35,22 @@ CPPUTEST_WARNINGFLAGS = -Wall -Wswitch-default -Werror
 CPPUTEST_CFLAGS += -Wall -Wstrict-prototypes -pedantic
 LD_LIBRARIES = -lpthread
 
+STUFF_TO_CLEAN += objs/* objs/src/tempodb/* objs/tests/* objs/mocks/* objs/tests/tempodb/* lib/libtempodb.a
+
+CC = cc
+
+all: lib/libtempodb.a
+
+lib/libtempodb.a: objs/base64.o objs/tempodb.o
+	ar rv lib/libtempodb.a objs/base64.o objs/tempodb.o
+
+objs/base64.o:
+	$(CC) -c -I include/tempodb -o objs/base64.o src/tempodb/base64.c
+
+objs/tempodb.o:
+	$(CC) -c -I include/tempodb -o objs/tempodb.o src/tempodb/tempodb.c
+
+CppUTest/lib/libCppUTest.a:
+	cd CppUTest && make lib/libCppUTest.a
+
 include $(CPPUTEST_HOME)/build/MakefileWorker.mk

CppUTest/lib/.git_empty_dir

@@ -10,18 +10,18 @@
  * The general strategy is:
  *
  * 1) Initialize the connection with:
- *    tempodb_create("YOUR_KEY", "YOUR_SECRET");
+ *    struct tempodb_config *config = tempodb_create("YOUR_KEY", "YOUR_SECRET");
  *
  * 2) Make one or more requests:
- *    status = tempodb_write_by_key("temperature", 45.3, response_buffer, 255);
+ *    status = tempodb_write_by_key(config, "temperature", 45.3, response_buffer, 255);
  *    if (status == -1) {
  *      perror("Error sending to tempodb:");
  *    } else {
  *      printf("Response: %s\n", response_buffer);
  *    }
  *
  * 3) Free TempoDB allocations
- *    tempodb_destroy();
+ *    tempodb_destroy(config);
  *
  *
  * An important note on timestamps:
@@ -43,7 +43,7 @@
  */
 
 int main(int argc, char **argv) {
-  tempodb_create("YOUR_KEY", "YOUR_SECRET");
+  struct tempodb_config *config = tempodb_create("YOUR_KEY", "YOUR_SECRET");
 
   char *response_buffer = (char *)malloc(255);
   int status;
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
    *
    * Also available: tempodb_write_by_id, which takes an TempoDB-generated id instead of the user-specified key
    */
-  status = tempodb_write_by_key("temperature", 45.3, response_buffer, 255);
+  status = tempodb_write_by_key(config, "temperature", 45.3, response_buffer, 255);
 
   /*
    * Increment By Key
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
    *
    * Also available: tempodb_increment_by_id, which takes an TempoDB-generated id instead of the user-specified key
    */
-  status = tempodb_increment_by_key("button_clicks", 1, response_buffer, 255);
+  status = tempodb_increment_by_key(config, "button_clicks", 1, response_buffer, 255);
 
   /* Bulk Write & Bulk Increment
    *
@@ -91,8 +91,8 @@ int main(int argc, char **argv) {
   updates[1] = update2;
 
   /* use whichever makes sense for you */
-  status = tempodb_bulk_write(updates, 2, response_buffer, 255);
-  status = tempodb_bulk_increment(updates, 2, response_buffer, 255);
+  status = tempodb_bulk_write(config, updates, 2, response_buffer, 255);
+  status = tempodb_bulk_increment(config, updates, 2, response_buffer, 255);
 
   free(updates);
 
@@ -103,5 +103,5 @@ int main(int argc, char **argv) {
   }
 
   free(response_buffer);
-  tempodb_destroy();
+  tempodb_destroy(config);
 }

CppUTest/lib/libCppUTest.a

@@ -9,27 +9,30 @@
 #define TEMPODB_GET "GET"
 #define TEMPODB_POST "POST"
 
+typedef struct tempodb_config tempodb_config;
+typedef struct tempodb_bulk_update tempodb_bulk_update;
+
 enum id_or_key {TEMPODB_ID, TEMPODB_KEY};
 
-struct tempodb_bulk_update {
+struct tempodb_bulk_update{
   const char *series;
   enum id_or_key type;
   float value;
 };
 
-void tempodb_create(const char *key, const char *secret);
-void tempodb_destroy(void);
+tempodb_config * tempodb_create(const char *key, const char *secret);
+void tempodb_destroy(tempodb_config *config);
 
-void tempodb_build_query(char *buffer, const size_t buffer_size, const char *verb, const char *path, const char *payload);
+void tempodb_build_query(tempodb_config *config, char *buffer, const size_t buffer_size, const char *verb, const char *path, const char *payload);
 
-int tempodb_write_by_id(const char *series_id, const float value, char *response_buffer, const ssize_t response_buffer_size);
-int tempodb_write_by_key(const char *series_key, const float value, char *response_buffer, const ssize_t response_buffer_size);
+int tempodb_write_by_id(tempodb_config *config, const char *series_id, const float value, char *response_buffer, const ssize_t response_buffer_size);
+int tempodb_write_by_key(tempodb_config *config, const char *series_key, const float value, char *response_buffer, const ssize_t response_buffer_size);
 
-int tempodb_increment_by_key(const char *series_key, const float value, char *response_buffer, const ssize_t response_buffer_size);
-int tempodb_increment_by_id(const char *series_id, const float value, char *response_buffer, const ssize_t response_buffer_size);
+int tempodb_increment_by_key(tempodb_config *config, const char *series_key, const float value, char *response_buffer, const ssize_t response_buffer_size);
+int tempodb_increment_by_id(tempodb_config *config, const char *series_id, const float value, char *response_buffer, const ssize_t response_buffer_size);
 
-int tempodb_bulk_increment(const struct tempodb_bulk_update *updates, ssize_t update_count, char *response_buffer, const ssize_t response_buffer_size);
-int tempodb_bulk_write(const struct tempodb_bulk_update *updates, ssize_t update_count, char *response_buffer, const ssize_t response_buffer_size);
+int tempodb_bulk_increment(tempodb_config *config, const tempodb_bulk_update *updates, ssize_t update_count, char *response_buffer, const ssize_t response_buffer_size);
+int tempodb_bulk_write(tempodb_config *config, const tempodb_bulk_update *updates, ssize_t update_count, char *response_buffer, const ssize_t response_buffer_size);
 
 #define ACCESS_KEY_SIZE 32
 

CppUTest/lib/libCppUTestExt.a

@@ -73,26 +73,22 @@ void set_test_response(const char *buffer) {
   response_buffer_bytes_sent = 0;
 }
 
-const char * test_ip(void) {
-  return "1.2.3.4";
-}
-
 void test_init(void) {
   int inet_pton_result;
 
   inet_ips = malloc(32);
   last_request = malloc(last_request_size + 1);
   memset(last_request, 0, last_request_size + 1);
 
-  inet_pton_result = inet_pton(AF_INET, test_ip(), inet_ips);
+  inet_pton_result = inet_pton(AF_INET, "1.2.3.4", inet_ips);
   if (inet_pton_result == 0) {
-    printf("Invalid IP for testing: %s\n", test_ip());
+    printf("Invalid IP for testing: %s\n", "1.2.3.4");
     exit(1);
   } else if (inet_pton_result == -1) {
     perror("Invalid address class");
     exit(1);
   }
-  hent = (struct hostent *)malloc(sizeof(struct hostent *));
+  hent = (struct hostent *)malloc(sizeof(struct hostent));
 
   response_buffer = malloc(response_buffer_size + 1);
   memset(response_buffer, 0, response_buffer_size + 1);