collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add padding to edge structure

Browse source
This commit is contained in:
c9s 2015-11-11 11:08:09 +08:00
parent 985c8593dd
commit 257ced4717
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bench.html
View file

@ -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);

9
bench_str.csv
View file

@ -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

Can't render this file because it has a wrong number of fields in line 447.

8
include/r3.h
View file

@ -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 {

1
tests/CMakeLists.txt
View file

@ -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)

4
tests/bench.c
View file

@ -20,7 +20,7 @@
unsigned long unixtime() {
struct timeval tp;
if (gettimeofday((struct timeval *) &tp, (NUL)) == 0) {
if (gettimeofday((struct timeval *) &tp, (NULL)) == 0) {
return tp.tv_sec;
}
return 0;
@ -30,7 +30,7 @@ double microtime() {
struct timeval tp;
long sec = 0L;
double msec = 0.0;
if (gettimeofday((struct timeval *) &tp, (NUL)) == 0) {
if (gettimeofday((struct timeval *) &tp, (NULL)) == 0) {
msec = (double) (tp.tv_usec / MICRO_IN_SEC);
sec = tp.tv_sec;
if (msec >= 1.0)