From e2d2b25d77b4ba81f96b060bac3708ce9d47f9a5 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Mon, 30 Jun 2014 08:47:11 -0700 Subject: [PATCH 01/33] adding test for leda micro framework --- leda/README.md | 16 ++++++++++++++++ leda/__init__.py | 0 leda/app.moon | 13 +++++++++++++ leda/benchmark_config | 24 ++++++++++++++++++++++++ leda/setup.py | 24 ++++++++++++++++++++++++ leda/source_code | 1 + 6 files changed, 78 insertions(+) create mode 100644 leda/README.md create mode 100644 leda/__init__.py create mode 100644 leda/app.moon create mode 100644 leda/benchmark_config create mode 100644 leda/setup.py create mode 100644 leda/source_code diff --git a/leda/README.md b/leda/README.md new file mode 100644 index 00000000000..5f9100096c9 --- /dev/null +++ b/leda/README.md @@ -0,0 +1,16 @@ +# Leda Benchmark Test + +Requires `leda` installed (see https://github.com/sergeyzavadski/leda for instructions) + + + +## Test URLs +### JSON Encoding + +http://localhost:8080/ + + + +### Plaintext URL + +http://localhost:8080/plaintext diff --git a/leda/__init__.py b/leda/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/leda/app.moon b/leda/app.moon new file mode 100644 index 00000000000..fc7fe91f761 --- /dev/null +++ b/leda/app.moon @@ -0,0 +1,13 @@ +require 'leda.http_server' + +with HTTPServer! + .port = 8080 + .host = '' + .on_request = (server, request, response) -> + if request.url\find("/json") + response.body = {message: 'Hello, World!'} + + if request.url\find("/plaintext") + response.body = 'Hello, World! ' + + \start! diff --git a/leda/benchmark_config b/leda/benchmark_config new file mode 100644 index 00000000000..5bdef5ec940 --- /dev/null +++ b/leda/benchmark_config @@ -0,0 +1,24 @@ +{ + "framework": "lapis", + "tests": [{ + "default": { + "setup_file": "setup", + "json_url": "/"json, + "plaintext_url": "/plaintext", + "port": 8080, + "approach": "Realistic", + "classification": "Micro", + "database": "None", + "framework": "leda", + "language": "moonscript", + "orm": "Raw", + "platform": "libpropeller", + "webserver": "None", + "os": "Linux", + "database_os": "Linux", + "display_name": "leda", + "notes": "", + "versus": "" + } + }] +} diff --git a/leda/setup.py b/leda/setup.py new file mode 100644 index 00000000000..03496311e47 --- /dev/null +++ b/leda/setup.py @@ -0,0 +1,24 @@ +import subprocess +import sys +import setup_util +import os + +def start(args, logfile, errfile): + subprocess.Popen('leda app.moon', shell=True, cwd="leda", 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 'app.moon' in line: + try: + pid = int(line.split(None, 2)[1]) + os.kill(pid, 15) + except OSError: + pass + + + return 0 diff --git a/leda/source_code b/leda/source_code new file mode 100644 index 00000000000..ffac745de50 --- /dev/null +++ b/leda/source_code @@ -0,0 +1 @@ +./leda/app.moon From 1a05a701e12f60b1e818ad35a02bcec0ac1f6232 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Mon, 30 Jun 2014 08:52:21 -0700 Subject: [PATCH 02/33] updating readme --- leda/README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/leda/README.md b/leda/README.md index 5f9100096c9..8b20e9693a8 100644 --- a/leda/README.md +++ b/leda/README.md @@ -1,7 +1,19 @@ # Leda Benchmark Test -Requires `leda` installed (see https://github.com/sergeyzavadski/leda for instructions) + +### Deployment + +Leda framework has to be built and installed. + + git clone https://github.com/sergeyzavadski/leda.git + ./configure + make + sudo make install + +### JSON Encoding Test + +* [Source](app.moon) ## Test URLs From f02aec7f2ba5153158ebec47974c31bc9ac465d3 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Mon, 30 Jun 2014 08:54:54 -0700 Subject: [PATCH 03/33] updating readme --- leda/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/leda/README.md b/leda/README.md index 8b20e9693a8..154ce0cfea2 100644 --- a/leda/README.md +++ b/leda/README.md @@ -3,12 +3,12 @@ ### Deployment -Leda framework has to be built and installed. +[Leda](https://github.com/sergeyzavadski/leda) framework has to be built and installed. git clone https://github.com/sergeyzavadski/leda.git ./configure make - sudo make install + sudo make install ### JSON Encoding Test @@ -19,7 +19,7 @@ Leda framework has to be built and installed. ## Test URLs ### JSON Encoding -http://localhost:8080/ +http://localhost:8080/json From 94637d044794bfb5a19eae82cebe5d0fe07ffd61 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Mon, 30 Jun 2014 08:55:37 -0700 Subject: [PATCH 04/33] updating readme --- leda/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leda/README.md b/leda/README.md index 154ce0cfea2..096edb27920 100644 --- a/leda/README.md +++ b/leda/README.md @@ -23,6 +23,6 @@ http://localhost:8080/json -### Plaintext URL +### Plaintext http://localhost:8080/plaintext From 58ce742413f33ed95bc1e310130bbd88e5e476e8 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Wed, 2 Jul 2014 09:15:56 -0700 Subject: [PATCH 05/33] updating language --- leda/benchmark_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leda/benchmark_config b/leda/benchmark_config index 5bdef5ec940..8d27806db18 100644 --- a/leda/benchmark_config +++ b/leda/benchmark_config @@ -10,7 +10,7 @@ "classification": "Micro", "database": "None", "framework": "leda", - "language": "moonscript", + "language": "lua", "orm": "Raw", "platform": "libpropeller", "webserver": "None", From 1e66e0f843b2d8456a40e5d210ef145a5831ca20 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 3 Jul 2014 08:15:25 -0700 Subject: [PATCH 06/33] updating code to use lua --- leda/README.md | 4 ++-- leda/app.lua | 14 ++++++++++++++ leda/app.moon | 13 ------------- leda/setup.py | 4 ++-- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 leda/app.lua delete mode 100644 leda/app.moon diff --git a/leda/README.md b/leda/README.md index 096edb27920..544985a0cd9 100644 --- a/leda/README.md +++ b/leda/README.md @@ -3,7 +3,7 @@ ### Deployment -[Leda](https://github.com/sergeyzavadski/leda) framework has to be built and installed. +[Leda](https://github.com/sergeyzavadski/leda) framework has to set up. git clone https://github.com/sergeyzavadski/leda.git ./configure @@ -13,7 +13,7 @@ ### JSON Encoding Test -* [Source](app.moon) +* [Source](app.lua) ## Test URLs diff --git a/leda/app.lua b/leda/app.lua new file mode 100644 index 00000000000..07e5a008a6e --- /dev/null +++ b/leda/app.lua @@ -0,0 +1,14 @@ +local http = require('leda.http') + +local server = http.Server(8080, '') + +server:request(function(request, response) + if request:url():find('/json') then + response.body = {message= 'Hello, World!'} + end + + if request:url():find('/plaintext') then + response.body = 'Hello, World!' + end + +end) diff --git a/leda/app.moon b/leda/app.moon deleted file mode 100644 index fc7fe91f761..00000000000 --- a/leda/app.moon +++ /dev/null @@ -1,13 +0,0 @@ -require 'leda.http_server' - -with HTTPServer! - .port = 8080 - .host = '' - .on_request = (server, request, response) -> - if request.url\find("/json") - response.body = {message: 'Hello, World!'} - - if request.url\find("/plaintext") - response.body = 'Hello, World! ' - - \start! diff --git a/leda/setup.py b/leda/setup.py index 03496311e47..c8b0b596312 100644 --- a/leda/setup.py +++ b/leda/setup.py @@ -4,7 +4,7 @@ import os def start(args, logfile, errfile): - subprocess.Popen('leda app.moon', shell=True, cwd="leda", stderr=errfile, stdout=logfile) + subprocess.Popen('leda app.lua', shell=True, cwd="leda", stderr=errfile, stdout=logfile) return 0 @@ -13,7 +13,7 @@ def stop(logfile, errfile): p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE) out, err = p.communicate() for line in out.splitlines(): - if 'app.moon' in line: + if 'app.lua' in line: try: pid = int(line.split(None, 2)[1]) os.kill(pid, 15) From 6279b9de2b73acd17186d769d9d128a03177cdfe Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 3 Jul 2014 09:41:30 -0700 Subject: [PATCH 07/33] adding server as callback parameter --- leda/app.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leda/app.lua b/leda/app.lua index 07e5a008a6e..ec31a81afe5 100644 --- a/leda/app.lua +++ b/leda/app.lua @@ -2,7 +2,7 @@ local http = require('leda.http') local server = http.Server(8080, '') -server:request(function(request, response) +server:request(function(server, request, response) if request:url():find('/json') then response.body = {message= 'Hello, World!'} end From 7231c68d365acf56dc094a85f92ac9f9c2c78ed5 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 3 Jul 2014 10:11:22 -0700 Subject: [PATCH 08/33] updating readme --- leda/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/leda/README.md b/leda/README.md index 544985a0cd9..53e68152f9c 100644 --- a/leda/README.md +++ b/leda/README.md @@ -6,6 +6,7 @@ [Leda](https://github.com/sergeyzavadski/leda) framework has to set up. git clone https://github.com/sergeyzavadski/leda.git + cd leda ./configure make sudo make install From e57c566831977a6ed564e99904e61de81e109df3 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 4 Jul 2014 06:40:21 -0700 Subject: [PATCH 09/33] updating to use latest api --- leda/app.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/leda/app.lua b/leda/app.lua index ec31a81afe5..3c87351627d 100644 --- a/leda/app.lua +++ b/leda/app.lua @@ -2,7 +2,7 @@ local http = require('leda.http') local server = http.Server(8080, '') -server:request(function(server, request, response) +server.request = function(server, request, response) if request:url():find('/json') then response.body = {message= 'Hello, World!'} end @@ -10,5 +10,4 @@ server:request(function(server, request, response) if request:url():find('/plaintext') then response.body = 'Hello, World!' end - -end) +end From 73c4fc0c0007ead2a3e2e32f2d71fbbe78b3a58d Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 10 Jul 2014 08:57:00 -0700 Subject: [PATCH 10/33] updating to meet requirements --- leda/README.md | 6 ------ leda/instasll.sh | 3 +++ leda/source_code | 2 +- toolset/setup/linux/languages/leda.sh | 10 ++++++++++ 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100755 leda/instasll.sh create mode 100755 toolset/setup/linux/languages/leda.sh diff --git a/leda/README.md b/leda/README.md index 53e68152f9c..0f8f97be069 100644 --- a/leda/README.md +++ b/leda/README.md @@ -5,12 +5,6 @@ [Leda](https://github.com/sergeyzavadski/leda) framework has to set up. - git clone https://github.com/sergeyzavadski/leda.git - cd leda - ./configure - make - sudo make install - ### JSON Encoding Test diff --git a/leda/instasll.sh b/leda/instasll.sh new file mode 100755 index 00000000000..53034c3b4ba --- /dev/null +++ b/leda/instasll.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +fw_depends leda diff --git a/leda/source_code b/leda/source_code index ffac745de50..c85c71b6d73 100644 --- a/leda/source_code +++ b/leda/source_code @@ -1 +1 @@ -./leda/app.moon +./leda/app.lua diff --git a/toolset/setup/linux/languages/leda.sh b/toolset/setup/linux/languages/leda.sh new file mode 100755 index 00000000000..d2fc3478808 --- /dev/null +++ b/toolset/setup/linux/languages/leda.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +RETCODE=$(fw_exists leda) +[ ! "$RETCODE" == 0 ] || { return 0; } + +git clone git@github.com:sergeyzavadski/leda.git +cd leda +./configure +make +sudo make install \ No newline at end of file From 561a2f54c7715c9295a997e079c918489b326b96 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 10 Jul 2014 08:58:33 -0700 Subject: [PATCH 11/33] fix name --- leda/benchmark_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leda/benchmark_config b/leda/benchmark_config index 8d27806db18..259234ccac1 100644 --- a/leda/benchmark_config +++ b/leda/benchmark_config @@ -1,5 +1,5 @@ { - "framework": "lapis", + "framework": "leda", "tests": [{ "default": { "setup_file": "setup", From 2e1fb218cf1f3de80ba6ba12f5ab0f6b0214cba7 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 10 Jul 2014 09:02:35 -0700 Subject: [PATCH 12/33] fix newline --- toolset/setup/linux/languages/leda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/setup/linux/languages/leda.sh b/toolset/setup/linux/languages/leda.sh index d2fc3478808..1eb94556684 100755 --- a/toolset/setup/linux/languages/leda.sh +++ b/toolset/setup/linux/languages/leda.sh @@ -7,4 +7,4 @@ git clone git@github.com:sergeyzavadski/leda.git cd leda ./configure make -sudo make install \ No newline at end of file +sudo make install From 22dfd04c9b20da046658823cf78c63ca91a790b0 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 10 Jul 2014 09:15:07 -0700 Subject: [PATCH 13/33] fixing typo and moving file --- leda/{instasll.sh => install.sh} | 0 toolset/setup/linux/{languages => frameworks}/leda.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename leda/{instasll.sh => install.sh} (100%) rename toolset/setup/linux/{languages => frameworks}/leda.sh (100%) diff --git a/leda/instasll.sh b/leda/install.sh similarity index 100% rename from leda/instasll.sh rename to leda/install.sh diff --git a/toolset/setup/linux/languages/leda.sh b/toolset/setup/linux/frameworks/leda.sh similarity index 100% rename from toolset/setup/linux/languages/leda.sh rename to toolset/setup/linux/frameworks/leda.sh From dccd8dc99970422d4d11b86fd0ae7921f89c6a3b Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 10 Jul 2014 10:33:34 -0700 Subject: [PATCH 14/33] refactored to add else clause --- leda/app.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/leda/app.lua b/leda/app.lua index 3c87351627d..b46cc1f93cb 100644 --- a/leda/app.lua +++ b/leda/app.lua @@ -5,9 +5,7 @@ local server = http.Server(8080, '') server.request = function(server, request, response) if request:url():find('/json') then response.body = {message= 'Hello, World!'} - end - - if request:url():find('/plaintext') then + elseif request:url():find('/plaintext') then response.body = 'Hello, World!' end end From 8f11ad4425a3888eaaf748aa42468a14d4e402de Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 10 Jul 2014 10:40:29 -0700 Subject: [PATCH 15/33] refactored to add caching --- leda/app.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/leda/app.lua b/leda/app.lua index b46cc1f93cb..0400b498bfd 100644 --- a/leda/app.lua +++ b/leda/app.lua @@ -3,9 +3,10 @@ local http = require('leda.http') local server = http.Server(8080, '') server.request = function(server, request, response) - if request:url():find('/json') then + local url = request:url() + if url:find('/json') then response.body = {message= 'Hello, World!'} - elseif request:url():find('/plaintext') then + elseif url:find('/plaintext') then response.body = 'Hello, World!' end end From 6ce8de1675cb856a4a96162c5cc7d06d1a0f99bb Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Sun, 13 Jul 2014 05:20:12 -0700 Subject: [PATCH 16/33] update setup script --- toolset/setup/linux/frameworks/leda.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100755 => 100644 toolset/setup/linux/frameworks/leda.sh diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100755 new mode 100644 index 1eb94556684..38a0f3b4287 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -3,8 +3,9 @@ RETCODE=$(fw_exists leda) [ ! "$RETCODE" == 0 ] || { return 0; } -git clone git@github.com:sergeyzavadski/leda.git -cd leda +wget http://sergeyzavadski.github.io/leda/releases/leda-0.4.1/leda-0.4.1.tar.gz +tar xvf leda-0.4.1.tar.gz +cd leda-0.4.1 ./configure make sudo make install From 645e94dcb5a7e4f0e8874c7111b2cab83a9da2f8 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Sun, 13 Jul 2014 05:22:28 -0700 Subject: [PATCH 17/33] update setup script --- toolset/setup/linux/frameworks/leda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index 38a0f3b4287..2b12a5083fd 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -1,6 +1,6 @@ #!/bin/bash -RETCODE=$(fw_exists leda) +RETCODE=$(fw_exists leda-0.4.1) [ ! "$RETCODE" == 0 ] || { return 0; } wget http://sergeyzavadski.github.io/leda/releases/leda-0.4.1/leda-0.4.1.tar.gz From 040651ddf5c17da0fe82c609ffbcb3599ee387bf Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Tue, 15 Jul 2014 04:46:07 -0700 Subject: [PATCH 18/33] update setup script --- leda/install.sh | 0 toolset/setup/linux/frameworks/leda.sh | 2 ++ 2 files changed, 2 insertions(+) mode change 100755 => 100644 leda/install.sh diff --git a/leda/install.sh b/leda/install.sh old mode 100755 new mode 100644 diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index 1eb94556684..2404f70b9ff 100755 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -3,6 +3,8 @@ RETCODE=$(fw_exists leda) [ ! "$RETCODE" == 0 ] || { return 0; } +sudo apt-get install g++ + git clone git@github.com:sergeyzavadski/leda.git cd leda ./configure From cb68524e13e3d0e2e32b4d783a9543f59378d322 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 17 Jul 2014 05:24:57 -0700 Subject: [PATCH 19/33] updates to code and install script --- leda/app.lua | 4 +++- toolset/setup/linux/frameworks/leda.sh | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) mode change 100644 => 100755 toolset/setup/linux/frameworks/leda.sh diff --git a/leda/app.lua b/leda/app.lua index 0400b498bfd..a3ca8911656 100644 --- a/leda/app.lua +++ b/leda/app.lua @@ -1,11 +1,13 @@ local http = require('leda.http') +local json = require('cjson') local server = http.Server(8080, '') server.request = function(server, request, response) local url = request:url() if url:find('/json') then - response.body = {message= 'Hello, World!'} + response.body = json.encode{message= 'Hello, World!'} + response.headers['Content-Type'] = 'application/json' elseif url:find('/plaintext') then response.body = 'Hello, World!' end diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100644 new mode 100755 index 1196d88cb29..e8726aee1e9 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -1,13 +1,16 @@ #!/bin/bash -RETCODE=$(fw_exists leda-0.4.1) +RETCODE=$(fw_exists leda-0.5.0) [ ! "$RETCODE" == 0 ] || { return 0; } -sudo apt-get install g++ +sudo apt-get install -y g++ +sudo apt-get install -y luarocks -wget http://sergeyzavadski.github.io/leda/releases/leda-0.4.1/leda-0.4.1.tar.gz -tar xvf leda-0.4.1.tar.gz -cd leda-0.4.1 +sudo luarocks install lua-cjson + +wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.0/leda-0.5.0.tar.gz +tar xvf leda-0.5.0.tar.gz +cd leda-0.5.0 ./configure make From 16db64abc1b0121f52305c774880c09076f84c76 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 17 Jul 2014 05:28:32 -0700 Subject: [PATCH 20/33] changing install script mode --- toolset/setup/linux/frameworks/leda.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 toolset/setup/linux/frameworks/leda.sh diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100755 new mode 100644 From ee92499598294f85be9efc2af1ccfc8173a664e3 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 17 Jul 2014 05:31:08 -0700 Subject: [PATCH 21/33] flags to apt-get --- toolset/setup/linux/frameworks/leda.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 toolset/setup/linux/frameworks/leda.sh diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100644 new mode 100755 index e8726aee1e9..c32c02f7712 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -3,8 +3,8 @@ RETCODE=$(fw_exists leda-0.5.0) [ ! "$RETCODE" == 0 ] || { return 0; } -sudo apt-get install -y g++ -sudo apt-get install -y luarocks +sudo apt-get install -y --fix-missing g++ +sudo apt-get install -y --fix-missing luarocks sudo luarocks install lua-cjson From 4d3b0af38587d5fb8577c9c81583bceeba448f67 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Thu, 17 Jul 2014 05:31:29 -0700 Subject: [PATCH 22/33] changing install script mode --- toolset/setup/linux/frameworks/leda.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 toolset/setup/linux/frameworks/leda.sh diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100755 new mode 100644 From bed4d0021ddacba348c79578d1b3e8753ec0dd1d Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 12:57:04 -0700 Subject: [PATCH 23/33] updating serup script --- toolset/setup/linux/frameworks/leda.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index c32c02f7712..9351ef9a837 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -1,16 +1,16 @@ #!/bin/bash -RETCODE=$(fw_exists leda-0.5.0) +RETCODE=$(fw_exists leda-0.5.1) [ ! "$RETCODE" == 0 ] || { return 0; } -sudo apt-get install -y --fix-missing g++ -sudo apt-get install -y --fix-missing luarocks +sudo apt-get install -y g++ +sudo apt-get install -y luarocks sudo luarocks install lua-cjson -wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.0/leda-0.5.0.tar.gz -tar xvf leda-0.5.0.tar.gz -cd leda-0.5.0 +wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.1/leda-0.5.1.tar.gz +tar xvf leda-0.5.1.tar.gz +cd leda-0.5.1 ./configure make From 2ed6dae84322299c78b4835c8fd4a9aff21e579c Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 14:49:45 -0700 Subject: [PATCH 24/33] updating config --- leda/benchmark_config | 2 +- toolset/setup/linux/frameworks/leda.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 toolset/setup/linux/frameworks/leda.sh diff --git a/leda/benchmark_config b/leda/benchmark_config index 259234ccac1..46d0c2faf5f 100644 --- a/leda/benchmark_config +++ b/leda/benchmark_config @@ -3,7 +3,7 @@ "tests": [{ "default": { "setup_file": "setup", - "json_url": "/"json, + "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100644 new mode 100755 index 9351ef9a837..b04c74f0ebe --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -8,9 +8,9 @@ sudo apt-get install -y luarocks sudo luarocks install lua-cjson -wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.1/leda-0.5.1.tar.gz -tar xvf leda-0.5.1.tar.gz -cd leda-0.5.1 +wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz +tar xvf leda-0.5.2.tar.gz +cd leda-0.5.2 ./configure make From ce5a31f6ef054be49a0f589719f5fb373d564d16 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 14:53:34 -0700 Subject: [PATCH 25/33] updating config --- toolset/setup/linux/frameworks/leda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 toolset/setup/linux/frameworks/leda.sh diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh old mode 100755 new mode 100644 index b04c74f0ebe..2201362579a --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -1,6 +1,6 @@ #!/bin/bash -RETCODE=$(fw_exists leda-0.5.1) +RETCODE=$(fw_exists leda-0.5.2) [ ! "$RETCODE" == 0 ] || { return 0; } sudo apt-get install -y g++ From 2d762b31300d25892f2e3c493c1b784f7cfa834f Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 15:07:48 -0700 Subject: [PATCH 26/33] removing standard libevent headers --- toolset/setup/linux/frameworks/leda.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index 2201362579a..b682d3c6bde 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -8,6 +8,9 @@ sudo apt-get install -y luarocks sudo luarocks install lua-cjson +sudo rm -rf /usr/local/include/event2 +sudo rm -rf /usr/local/event2 + wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz tar xvf leda-0.5.2.tar.gz cd leda-0.5.2 From 2345c6ef592c5772da08207e169aa24fc2190444 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 15:08:56 -0700 Subject: [PATCH 27/33] removing standard libevent headers --- toolset/setup/linux/frameworks/leda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index b682d3c6bde..76a7471611b 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -9,7 +9,7 @@ sudo apt-get install -y luarocks sudo luarocks install lua-cjson sudo rm -rf /usr/local/include/event2 -sudo rm -rf /usr/local/event2 +sudo rm -rf /usr/include/event2 wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz tar xvf leda-0.5.2.tar.gz From 9c2b0e6a59e583247cbd9ebcf9ba2abee8ee3ec3 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 15:29:22 -0700 Subject: [PATCH 28/33] removing the wrong commands --- toolset/setup/linux/frameworks/leda.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index 76a7471611b..3bfedf6a4cc 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -8,8 +8,6 @@ sudo apt-get install -y luarocks sudo luarocks install lua-cjson -sudo rm -rf /usr/local/include/event2 -sudo rm -rf /usr/include/event2 wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz tar xvf leda-0.5.2.tar.gz From 8633df31f27741ab4330e98ca91a27e6dbfc5fdf Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 16:35:41 -0700 Subject: [PATCH 29/33] making required changes --- toolset/setup/linux/frameworks/leda.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index 3bfedf6a4cc..92295f91b3e 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -1,18 +1,23 @@ #!/bin/bash -RETCODE=$(fw_exists leda-0.5.2) +RETCODE=$(fw_exists leda) [ ! "$RETCODE" == 0 ] || { return 0; } +rm -rf leda + sudo apt-get install -y g++ sudo apt-get install -y luarocks sudo luarocks install lua-cjson -wget http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz -tar xvf leda-0.5.2.tar.gz +wget -O leda.tar.gz http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz +fw_untar leda.tar.gz cd leda-0.5.2 ./configure make sudo make install +cd .. +mv leda-0.5.2 leda + From cf3f076a8b68d24fa029e2bfb11648153746e67d Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 17:20:40 -0700 Subject: [PATCH 30/33] updating version --- toolset/setup/linux/frameworks/leda.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index 92295f91b3e..b50edb0ac4f 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -11,13 +11,13 @@ sudo apt-get install -y luarocks sudo luarocks install lua-cjson -wget -O leda.tar.gz http://sergeyzavadski.github.io/leda/releases/leda-0.5.2/leda-0.5.2.tar.gz +wget -O leda.tar.gz http://sergeyzavadski.github.io/leda/releases/leda-0.5.3/leda-0.5.3.tar.gz fw_untar leda.tar.gz -cd leda-0.5.2 +cd leda-0.5.3 ./configure make sudo make install cd .. -mv leda-0.5.2 leda +mv leda-0.5.3 leda From 2629467de8e9facfd93119e7c36c078dbd47c6bd Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 18:53:29 -0700 Subject: [PATCH 31/33] updates --- toolset/setup/linux/frameworks/leda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index b50edb0ac4f..d7924daa017 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -3,7 +3,7 @@ RETCODE=$(fw_exists leda) [ ! "$RETCODE" == 0 ] || { return 0; } -rm -rf leda +rm -rf leda || true sudo apt-get install -y g++ sudo apt-get install -y luarocks From 2ddbf3c3ab11c0971b19d452b50fbec187569b49 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 19:10:13 -0700 Subject: [PATCH 32/33] updates --- toolset/setup/linux/frameworks/leda.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index d7924daa017..ff5f9ebf925 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -11,9 +11,9 @@ sudo apt-get install -y luarocks sudo luarocks install lua-cjson -wget -O leda.tar.gz http://sergeyzavadski.github.io/leda/releases/leda-0.5.3/leda-0.5.3.tar.gz +wget -O leda.tar.gz http://sergeyzavadski.github.io/leda/releases/leda-0.5.4/leda-0.5.4.tar.gz fw_untar leda.tar.gz -cd leda-0.5.3 +cd leda-0.5.4 ./configure make From 9c90f4a0a08bc2be1ad92d8ae026c7de9dd422b8 Mon Sep 17 00:00:00 2001 From: Sergey Zavadski Date: Fri, 18 Jul 2014 19:10:42 -0700 Subject: [PATCH 33/33] updates --- toolset/setup/linux/frameworks/leda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/setup/linux/frameworks/leda.sh b/toolset/setup/linux/frameworks/leda.sh index ff5f9ebf925..3bfe0352954 100644 --- a/toolset/setup/linux/frameworks/leda.sh +++ b/toolset/setup/linux/frameworks/leda.sh @@ -19,5 +19,5 @@ cd leda-0.5.4 make sudo make install cd .. -mv leda-0.5.3 leda +mv leda-0.5.4 leda