diff --git a/bench.html b/bench.html index 505c356..64ea5b5 100644 --- a/bench.html +++ b/bench.html @@ -151,11 +151,17 @@ var lines = data.split(/\n/); // keep window size to 30 records - lines.splice(-30); - lines = lines.splice(lines.length - 30); + lines = lines.splice(-30); + // lines = lines.splice(lines.length - 30); $(lines).each(function(i,line) { + if (line == "") { + return; + } var columns = line.split(/,/); + if (columns.length == 0) { + return; + } var a; a = parseInt(columns[1]); options.series[0].data.push(a || 0); diff --git a/bench_str.csv b/bench_str.csv index 6ae5309..2db3b40 100644 --- a/bench_str.csv +++ b/bench_str.csv @@ -629,4 +629,11 @@ 1447158285,11638128.71,5241775.30,71089.90,2321077.83 1447158396,13539837.29,5874704.47,47662.55,2533571.93 1447158415,14054879.53,5952300.47,41527.76,2571669.83 -1447158461,14000558.11,5739623.36,53092.46,2529610.40 +1447210457,13616841.50,5604087.24,83886.08,2458628.97 +1447210807,14529897.99,5833087.33,77672.30,1845729.06 +1447210834,14016924.69,5806227.80,66576.25,1715107.19 +1447211104,14738120.40,5873312.56,58254.22,2092537.05 +1447211128,14875503.82,5649431.95,27776.85,2033045.40 +1447211244,15335902.86,6019829.26,77672.30,1842297.15 +1447211259,14365504.46,5812325.12,91180.52,1965977.09 +1447211278,15175749.51,5931324.37,99864.38,1905029.23 diff --git a/include/r3.h b/include/r3.h index 01f8aac..a707c84 100644 --- a/include/r3.h +++ b/include/r3.h @@ -54,10 +54,10 @@ struct _node { struct _edge { char * pattern; // 8 bytes node * child; // 8 bytes - unsigned int pattern_len; // 1 byte - unsigned int opcode; - // unsigned char opcode:4; // 4 bit - unsigned char has_slug:1; // 1 bit + unsigned int pattern_len; // 4byte + unsigned int opcode; // 4byte + unsigned int has_slug; // 4byte + char _padding[ 64 - (sizeof(char*) + sizeof(node*) + sizeof(unsigned int) * 3) ]; }; struct _route { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b29c5d8..804f5d6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,4 @@ # set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3) -# set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3) include_directories("${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}") find_package(Check REQUIRED) find_package(PCRE REQUIRED)