Browse Source

Fixed benchmark_config to also perform db tests. Makefile fix for clean. Run without info data.

David Moreno 12 years ago
parent
commit
1be773be30
3 changed files with 5 additions and 1 deletions
  1. 1 1
      onion/Makefile
  2. 2 0
      onion/benchmark_config
  3. 2 0
      onion/setup.py

+ 1 - 1
onion/Makefile

@@ -6,7 +6,7 @@ LDFLAGS=-lonion -ljson -lmysqlclient -lpthread -L/usr/lib64/mysql/ -Lonion/build
 hello: hello.c
 hello: hello.c
 
 
 clean:
 clean:
-	rm *.o hello
+	rm -f *.o hello
 
 
 	
 	
 onion:
 onion:

+ 2 - 0
onion/benchmark_config

@@ -4,6 +4,8 @@
     "default": {
     "default": {
       "setup_file": "setup",
       "setup_file": "setup",
       "json_url": "/",
       "json_url": "/",
+      "db_url": "/db",
+      "query_url": "/db?queries=",
       "port": 8080,
       "port": 8080,
       "sort": 37
       "sort": 37
     }
     }

+ 2 - 0
onion/setup.py

@@ -3,8 +3,10 @@ import sys
 import os
 import os
 
 
 def start(args):
 def start(args):
+	os.putenv("ONION_LOG","noinfo")
   os.system("make && ./hello &")
   os.system("make && ./hello &")
   return 0
   return 0
+
 def stop():
 def stop():
   
   
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)