Updated the C frameworks

frameworks/C/duda/setup.py

@@ -1,17 +0,0 @@
-import subprocess
-import sys
-import os
-import setup_util 
-
-def start(args, logfile, errfile):
-  subprocess.Popen("dudac -w $TROOT/webservice -p 2001", shell=True, stderr=errfile, stdout=logfile);
-  return 0
-
-def stop(logfile, errfile):
-  p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
-  out, err = p.communicate()
-  for line in out.splitlines():
-    if 'monkey' in line:
-      pid = int(line.split(None, 2)[1])
-      os.kill(pid, 15)
-  return 0

frameworks/C/duda/setup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+dudac -w $TROOT/webservice -p 2001

frameworks/C/lwan/benchmark_config

@@ -24,7 +24,7 @@
       "versus": ""
     },
     "mysql": {
-      "setup_file": "setup",
+      "setup_file": "setup-mysql",
       "db_url": "/db",
       "query_url": "/queries?queries=",
       "fortune_url": "/fortunes",

frameworks/C/lwan/setup-mysql.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export USE_MYSQL=1
+export MYSQL_USER=benchmarkdbuser
+export MYSQL_PASS=benchmarkdbpass
+export MYSQL_HOST=$DBHOST
+export MYSQL_DB=hello_world
+
+cd $LWAN_ROOT/techempower
+$LWAN_BUILD/techempower/techempower

frameworks/C/lwan/setup.py

@@ -1,36 +0,0 @@
-import subprocess
-import sys
-import os
-
-def get_env_for_database(args):
-  if args.database == 'MySQL':
-    return {
-      'USE_MYSQL': '1',
-      'MYSQL_USER': 'benchmarkdbuser',
-      'MYSQL_PASS': 'benchmarkdbpass',
-      'MYSQL_HOST': args.database_host,
-      'MYSQL_DB': 'hello_world'
-    }
-  return None
-
-def start(args, logfile, errfile):
-  subprocess.call('rm -rf ${LWAN_BUILD}', shell=True, stderr=errfile, stdout=logfile)
-  subprocess.call('mkdir -p ${LWAN_BUILD}', shell=True, stderr=errfile, stdout=logfile)
-  subprocess.call('cmake ${LWAN_ROOT} -DCMAKE_BUILD_TYPE=Release && make techempower',
-      cwd=os.environ['LWAN_BUILD'], shell=True, stderr=errfile, stdout=logfile)
-
-  db_dir = os.path.join(os.environ['LWAN_ROOT'], 'techempower')
-  exe_path = os.path.join(os.environ['LWAN_BUILD'], 'techempower', 'techempower')
-
-  subprocess.Popen(exe_path, cwd=db_dir, stderr=errfile, stdout=logfile, shell=True,
-      env = get_env_for_database(args))
-
-  return 0
-
-def stop(logfile, errfile):
-  p = subprocess.Popen(['pgrep', 'techempower'], stdout=subprocess.PIPE)
-  out, err = p.communicate()
-  for line in out.splitlines():
-      pid = int(line)
-      os.kill(pid, 2)
-  return 0

frameworks/C/lwan/setup.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $LWAN_ROOT/techempower
+$LWAN_BUILD/techempower/techempower

frameworks/C/onion/setup.py

@@ -1,23 +0,0 @@
-import subprocess
-import sys
-import os
-import setup_util 
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("onion/hello.c", "mysql_real_connect\(data.db\[i\], \".*\",", "mysql_real_connect(data.db[i], \"" + args.database_host + "\",")
-  
-  subprocess.call("rm -f *.o", cwd="onion", shell=True, stderr=errfile, stdout=logfile)
-  subprocess.call("cp -R $IROOT/onion/ onion/onion", shell=True, stderr=errfile, stdout=logfile)
-  subprocess.call("rm CMakeCache.txt", shell=True, cwd="onion/onion/build", stderr=errfile, stdout=logfile)
-  subprocess.Popen("make && ./hello", shell=True, cwd="onion", stderr=errfile, stdout=logfile)
-  return 0
-
-def stop(logfile, errfile):
-  
-  p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
-  out, err = p.communicate()
-  for line in out.splitlines():
-    if 'hello' in line:
-      pid = int(line.split(None, 2)[1])
-      os.kill(pid, 15)
-  return 0

frameworks/C/onion/setup.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -f *.o
+cp -R $IROOT/onion onion/onion
+rm CMakeCache.txt
+make && ./hello