Set appropriate compilation flags for perf and test Makefile targets. Fix typo in rmq_perf.cpp. Fix compilation warning due to incorrect format string specifier for 'nreq'. Human readable typedefs in types.hpp. Remove unused variable CFLAGS in Makefile.

Author: dhruvbird

Makefile

@@ -1,4 +1,3 @@
-CFLAGS=		-W -Wall -std=c99 -pedantic $(COPT)
 CXXFLAGS=       -Wall $(COPT) -D_FILE_OFFSET_BITS=64
 LINKFLAGS=	-lm -lrt -pthread
 INCDEPS=        include/segtree.hpp include/sparsetable.hpp include/benderrmq.hpp \
@@ -17,14 +16,15 @@ endif
 
 .PHONY: all clean debug test perf
 
-all: CFLAGS   += -O2
 all: CXXFLAGS += -O2
 all: targets
 
-debug: CFLAGS   += -g -DDEBUG
 debug: CXXFLAGS += -g -DDEBUG
 debug: targets
 
+test: CXXFLAGS += -g -DDEBUG
+perf: CXXFLAGS += -O2
+
 targets: lib-face
 
 lib-face: src/main.cpp $(OBJDEPS) $(INCDEPS)

include/benderrmq.hpp

@@ -188,7 +188,7 @@ toGraphViz(BinaryTreeNode* par, BinaryTreeNode *n) {
 }
 
 class LookupTables {
-    vvvc_t repr;
+    char_array_3d_t repr;
 
     /* The bitmaps are stored with the LSB always set as 1 and the LSB
      * signifying the sign of the element at array index 0. The MSB
@@ -218,7 +218,7 @@ class LookupTables {
 	    // first. i.e. table[3][5] and NOT table[5][3]. Never
 	    // lookup with the same index on both dimenstion (for
 	    // example: table[3][3]).
-	    vvc_t table(nbits-1, vc_t(nbits, -1));
+	    char_array_2d_t table(nbits-1, vc_t(nbits, -1));
 
 	    // Compute the lookup table for the bitmap in 'i'.
 	    for (int r = 0; r < nbits-1; ++r) {

include/types.hpp

@@ -99,4 +99,9 @@ typedef std::vector<char> vc_t;
 typedef std::vector<vc_t> vvc_t;
 typedef std::vector<vvc_t> vvvc_t;
 
+typedef vc_t   char_array_1d_t;
+typedef vvc_t  char_array_2d_t;
+typedef vvvc_t char_array_3d_t;
+
+
 #endif // LIBFACE_TYPES_HPP

src/main.cpp

@@ -664,7 +664,7 @@ static void handle_stats(client_t *client, parsed_url_t &url) {
     std::string body;
     char buff[2048];
     char *b = buff;
-    b += sprintf(b, "Answered %llu queries\n", nreq);
+    b += sprintf(b, "Answered %lu queries\n", nreq);
     b += sprintf(b, "Uptime: %s\n", get_uptime().c_str());
 
     if (building) {

tests/rmq_perf.cpp

@@ -148,7 +148,6 @@ main() {
     printf("Starting Segment Tree Test\n");
     test_segtree(input, queries, results);
 
-    printf("Starting bender RMQ Test\n");
+    printf("Starting Bender RMQ Test\n");
     test_benderrmq(input, queries, results);
-
 }