Browse Source

649 Added Weber and Elixir

Fixed the setup_weber.py file and changed the benchmark_config file,
installer.py now installs both Weber and Elixir.
James Yen 11 years ago
parent
commit
9d0d7ebd3f

+ 3 - 4
WeberFramework/benchmark_config

@@ -4,8 +4,7 @@
     "default": {
     "default": {
       "setup_file": "setup_weber",
       "setup_file": "setup_weber",
       "json_url": "/json",
       "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/db?queries=",
+      "plaintext_url": "/plaintext",
       "port": 8080,
       "port": 8080,
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
@@ -20,6 +19,6 @@
       "display_name": "weber",
       "display_name": "weber",
       "notes": "",
       "notes": "",
       "versus": "",
       "versus": "",
-      "skip": "true"
+      "skip": "false"
   }}]
   }}]
-}
+}

+ 5 - 5
WeberFramework/setup_weber.py

@@ -3,16 +3,16 @@ import subprocess
 
 
 def start(args, logfile, errfile):
 def start(args, logfile, errfile):
     try:
     try:
-        subprocess.check_call("mix deps.get", shell=True, stderr=errfile, stdout=logfile)
-        subprocess.check_call("mix compile --all --force", shell=True, stderr=errfile, stdout=logfile)
-        subprocess.check_call("./start.sh", shell=True, stderr=errfile, stdout=logfile)
+        subprocess.check_call("mix deps.get", cwd="WeberFramework", shell=True, stderr=errfile, stdout=logfile)
+        subprocess.check_call("mix compile --all --force", cwd="WeberFramework", shell=True, stderr=errfile, stdout=logfile)
+        subprocess.check_call("./start.sh", cwd="WeberFramework", shell=True, stderr=errfile, stdout=logfile)
         return 0
         return 0
     except subprocess.CalledProcessError:
     except subprocess.CalledProcessError:
         return 1
         return 1
  
  
 def stop(logfile, errfile):
 def stop(logfile, errfile):
     try:
     try:
-        subprocess.check_call("killall beam.smp", shell=True, cwd="/usr/bin")
+        subprocess.check_call("killall beam", shell=True, cwd="/usr/bin")
         return 0
         return 0
     except subprocess.CalledProcessError:
     except subprocess.CalledProcessError:
-        return 1
+        return 1

+ 2 - 1
config/benchmark_profile

@@ -15,8 +15,9 @@ export PYTHON_HOME=~/FrameworkBenchmarks/installs/python-2.7.5
 export RACKET_HOME=~/FrameworkBenchmarks/installs/racket-5.3.6
 export RACKET_HOME=~/FrameworkBenchmarks/installs/racket-5.3.6
 export NIMROD_HOME=~/FrameworkBenchmarks/installs/nimrod
 export NIMROD_HOME=~/FrameworkBenchmarks/installs/nimrod
 export NGINX_HOME=/usr/local/nginx
 export NGINX_HOME=/usr/local/nginx
+export ELIXIR_HOME=~/FrameworkBenchmarks/installs/elixir-0.13.3
 
 
-export PATH="$PYTHON_HOME/bin:$PATH$JAVA_HOME/bin:$GRAILS_HOME/bin:$PLAY_HOME:$PLAY1_HOME:$VERTX_HOME/bin:$GOROOT/bin:$NODE_HOME/bin:$HOME/FrameworkBenchmarks/installs/bin:$MAVEN_HOME/bin:$PERL_HOME/bin:$PERL_HOME/site/bin:$DART_HOME/bin:$RACKET_HOME/bin:$NIMROD_HOME/bin:$NGINX_HOME/sbin:$PATH"
+export PATH="$PYTHON_HOME/bin:$PATH$JAVA_HOME/bin:$GRAILS_HOME/bin:$PLAY_HOME:$PLAY1_HOME:$VERTX_HOME/bin:$GOROOT/bin:$NODE_HOME/bin:$HOME/FrameworkBenchmarks/installs/bin:$MAVEN_HOME/bin:$PERL_HOME/bin:$PERL_HOME/site/bin:$DART_HOME/bin:$RACKET_HOME/bin:$NIMROD_HOME/bin:$NGINX_HOME/sbin:$ELIXIR_HOME/bin:$PATH"
 
 
 export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/local/apr/lib'
 export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/local/apr/lib'
 
 

+ 16 - 0
toolset/setup/linux/installer.py

@@ -18,6 +18,7 @@ class Installer:
 
 
     if self.benchmarker.install == 'all' or self.benchmarker.install == 'client':
     if self.benchmarker.install == 'all' or self.benchmarker.install == 'client':
         self.__install_client_software()
         self.__install_client_software()
+
   ############################################################
   ############################################################
   # End install_software
   # End install_software
   ############################################################
   ############################################################
@@ -93,6 +94,14 @@ class Installer:
     self.__run_command("sudo apt-get install openjdk-7-jdk", True)
     self.__run_command("sudo apt-get install openjdk-7-jdk", True)
     self.__run_command("sudo apt-get remove --purge openjdk-6-jre openjdk-6-jre-headless", True)
     self.__run_command("sudo apt-get remove --purge openjdk-6-jre openjdk-6-jre-headless", True)
 
 
+    #
+    # Elixir
+    #
+    self.__run_command("wget https://github.com/elixir-lang/elixir/archive/v0.13.3.tar.gz");
+    self.__run_command("sudo tar -zxf v0.13.3.tar.gz");
+    self.__run_command("sudo make clean", cwd="elixir-0.13.3");
+    self.__run_command("sudo make test", cwd="elixir-0.13.3");
+
     #
     #
     # Ruby/JRuby
     # Ruby/JRuby
     #
     #
@@ -272,6 +281,13 @@ class Installer:
     self.__run_command("mv -f zmq_compat.h mongrel2/src/")
     self.__run_command("mv -f zmq_compat.h mongrel2/src/")
     self.__run_command("make clean all && sudo make install", cwd="mongrel2")
     self.__run_command("make clean all && sudo make install", cwd="mongrel2")
 
 
+    #
+    # Weber
+    #
+    self.__run_command("git clone https://github.com/elixir-web/weber.git");
+    self.__run_command("make", cwd="weber");
+    self.__run_command("make test", cwd="weber");
+
     ##############################################################
     ##############################################################
     # Frameworks
     # Frameworks
     ##############################################################
     ##############################################################