Remove /config directory and more toolset cleanup (#2419)

* remove the config directory

* fix fw_depends to search for an installation file at any depth within the toolset/setup/linux structure

* fixed space typo, grouped more installations

* fixed broken path

* dpkg options needed to be separate arguments

config/apache2.conf

@@ -1,237 +0,0 @@
-#
-# Based upon the NCSA server configuration files originally by Rob McCool.
-#
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.2/ for detailed information about
-# the directives.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
-#
-# The configuration directives are grouped into three basic sections:
-#  1. Directives that control the operation of the Apache server process as a
-#     whole (the 'global environment').
-#  2. Directives that define the parameters of the 'main' or 'default' server,
-#     which responds to requests that aren't handled by a virtual host.
-#     These directives also provide default values for the settings
-#     of all virtual hosts.
-#  3. Settings for virtual hosts, which allow Web requests to be sent to
-#     different IP addresses or hostnames and have them handled by the
-#     same Apache server process.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "foo.log"
-# with ServerRoot set to "/etc/apache2" will be interpreted by the
-# server as "/etc/apache2/foo.log".
-#
-
-### Section 1: Global Environment
-#
-# The directives in this section affect the overall operation of Apache,
-# such as the number of concurrent requests it can handle or where it
-# can find its configuration files.
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-LockFile ${APACHE_LOCK_DIR}/accept.lock
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 1000
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-##
-## Server-Pool Size Regulation (MPM specific)
-## 
-
-# prefork MPM
-# StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxClients: maximum number of server processes allowed to start
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_prefork_module>
-    StartServers          5
-    MinSpareServers       5
-    MaxSpareServers      10
-    MaxClients          256
-    MaxRequestsPerChild   0
-</IfModule>
-
-# worker MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
-#              graceful restart. ThreadLimit can only be changed by stopping
-#              and starting Apache.
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxClients: maximum number of simultaneous client connections
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_worker_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          256
-    MaxRequestsPerChild   0
-</IfModule>
-
-# event MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxClients: maximum number of simultaneous client connections
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_event_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          256
-    MaxRequestsPerChild   0
-</IfModule>
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
-#
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-    Satisfy all
-</Files>
-
-#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-# It is also possible to omit any default MIME type and let the
-# client's browser guess an appropriate action instead. Typically the
-# browser will decide based on the file's extension then. In cases
-# where no good assumption can be made, letting the default MIME type
-# unset is suggested  instead of forcing the browser to accept
-# incorrect  metadata.
-#
-DefaultType None
-
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel crit
-
-# Include module configuration:
-Include mods-enabled/*.load
-Include mods-enabled/*.conf
-
-# Include all the user configurations:
-Include httpd.conf
-
-# Include ports listing
-Include ports.conf
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive (see below).
-# If you are behind a reverse proxy, you might want to change %h into %{X-Forwarded-For}i
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-Include conf.d/
-
-# Include the virtual host configurations:
-Include sites-enabled/

config/client.c

@@ -1,571 +0,0 @@
-/*
- * weighttp - a lightweight and simple webserver benchmarking tool
- *
- * Author:
- *     Copyright (c) 2009-2011 Thomas Porzelt
- *
- * License:
- *     MIT, see COPYING file
- */
-
-#include "weighttp.h"
-
-static uint8_t client_parse(Client *client, int size);
-static void client_io_cb(struct ev_loop *loop, ev_io *w, int revents);
-static void client_set_events(Client *client, int events);
-/*
-static void client_add_events(Client *client, int events);
-static void client_rem_events(Client *client, int events);
-static void client_add_events(Client *client, int events) {
-  struct ev_loop *loop = client->worker->loop;
-  ev_io *watcher = &client->sock_watcher;
-
-  if ((watcher->events & events) == events)
-    return;
-
-  ev_io_stop(loop, watcher);
-  ev_io_set(watcher, watcher->fd, watcher->events | events);
-  ev_io_start(loop, watcher);
-}
-
-static void client_rem_events(Client *client, int events) {
-  struct ev_loop *loop = client->worker->loop;
-  ev_io *watcher = &client->sock_watcher;
-
-  if (0 == (watcher->events & events))
-    return;
-
-  ev_io_stop(loop, watcher);
-  ev_io_set(watcher, watcher->fd, watcher->events & ~events);
-  ev_io_start(loop, watcher);
-}
-*/
-
-static void client_set_events(Client *client, int events) {
-  struct ev_loop *loop = client->worker->loop;
-  ev_io *watcher = &client->sock_watcher;
-
-  if (events == (watcher->events & (EV_READ | EV_WRITE)))
-    return;
-
-  ev_io_stop(loop, watcher);
-  ev_io_set(watcher, watcher->fd, (watcher->events & ~(EV_READ | EV_WRITE)) | events);
-  ev_io_start(loop, watcher);
-}
-
-Client *client_new(Worker *worker) {
-  Client *client;
-
-  client = W_MALLOC(Client, 1);
-  client->state = CLIENT_START;
-  client->worker = worker;
-  client->sock_watcher.fd = -1;
-  client->sock_watcher.data = client;
-  client->content_length = -1;
-  client->buffer_offset = 0;
-  client->request_offset = 0;
-  client->keepalive = client->worker->config->keep_alive;
-  client->chunked = 0;
-  client->chunk_size = -1;
-  client->chunk_received = 0;
-
-  return client;
-}
-
-void client_free(Client *client) {
-  if (client->sock_watcher.fd != -1) {
-    ev_io_stop(client->worker->loop, &client->sock_watcher);
-    shutdown(client->sock_watcher.fd, SHUT_WR);
-    close(client->sock_watcher.fd);
-  }
-
-  free(client);
-}
-
-static void client_reset(Client *client) {
-  //printf("keep alive: %d\n", client->keepalive);
-  if (!client->keepalive) {
-    if (client->sock_watcher.fd != -1) {
-      ev_io_stop(client->worker->loop, &client->sock_watcher);
-      shutdown(client->sock_watcher.fd, SHUT_WR);
-      close(client->sock_watcher.fd);
-      client->sock_watcher.fd = -1;
-    }
-
-    client->state = CLIENT_START;
-  } else {
-    client_set_events(client, EV_WRITE);
-    client->state = CLIENT_WRITING;
-    client->worker->stats.req_started++;
-  }
-
-  client->parser_state = PARSER_START;
-  client->buffer_offset = 0;
-  client->parser_offset = 0;
-  client->request_offset = 0;
-  client->ts_start = 0;
-  client->ts_end = 0;
-  client->status_success = 0;
-  client->success = 0;
-  client->content_length = -1;
-  client->bytes_received = 0;
-  client->header_size = 0;
-  client->keepalive = client->worker->config->keep_alive;
-  client->chunked = 0;
-  client->chunk_size = -1;
-  client->chunk_received = 0;
-}
-
-static uint8_t client_connect(Client *client) {
-  //printf("connecting...\n");
-  start:
-
-  if (-1 == connect(client->sock_watcher.fd, client->worker->config->saddr->ai_addr, client->worker->config->saddr->ai_addrlen)) {
-    switch (errno) {
-      case EINPROGRESS:
-      case EALREADY:
-        /* async connect now in progress */
-        client->state = CLIENT_CONNECTING;
-        return 1;
-      case EISCONN:
-        break;
-      case EINTR:
-        goto start;
-      default:
-      {
-        strerror_r(errno, client->buffer, sizeof(client->buffer));
-        W_ERROR("connect() failed: %s (%d)", client->buffer, errno);
-        return 0;
-      }
-    }
-  }
-
-  /* successfully connected */
-  client->state = CLIENT_WRITING;
-  return 1;
-}
-
-static void client_io_cb(struct ev_loop *loop, ev_io *w, int revents) {
-  Client *client = w->data;
-
-  UNUSED(loop);
-  UNUSED(revents);
-
-  client_state_machine(client);
-}
-
-void client_state_machine(Client *client) {
-  int r;
-  Config *config = client->worker->config;
-
-  start:
-  //printf("state: %d\n", client->state);
-  switch (client->state) {
-    case CLIENT_START:
-      client->worker->stats.req_started++;
-
-      do {
-        r = socket(config->saddr->ai_family, config->saddr->ai_socktype, config->saddr->ai_protocol);
-      } while (-1 == r && errno == EINTR);
-
-      if (-1 == r) {
-        client->state = CLIENT_ERROR;
-        strerror_r(errno, client->buffer, sizeof(client->buffer));
-        W_ERROR("socket() failed: %s (%d)", client->buffer, errno);
-        goto start;
-      }
-
-      /* set non-blocking */
-      fcntl(r, F_SETFL, O_NONBLOCK | O_RDWR);
-
-      ev_init(&client->sock_watcher, client_io_cb);
-      ev_io_set(&client->sock_watcher, r, EV_WRITE);
-      ev_io_start(client->worker->loop, &client->sock_watcher);
-
-      if (!client_connect(client)) {
-        client->state = CLIENT_ERROR;
-        goto start;
-      } else {
-        client_set_events(client, EV_WRITE);
-        return;
-      }
-    case CLIENT_CONNECTING:
-      if (!client_connect(client)) {
-        client->state = CLIENT_ERROR;
-        goto start;
-      }
-    case CLIENT_WRITING:
-      while (1) {
-        r = write(client->sock_watcher.fd, &config->request[client->request_offset], config->request_size - client->request_offset);
-        //printf("write(%d - %d = %d): %d\n", config->request_size, client->request_offset, config->request_size - client->request_offset, r);
-        if (r == -1) {
-          /* error */
-          if (errno == EINTR)
-            continue;
-          strerror_r(errno, client->buffer, sizeof(client->buffer));
-          W_ERROR("write() failed: %s (%d)", client->buffer, errno);
-          client->state = CLIENT_ERROR;
-          goto start;
-        } else if (r != 0) {
-          /* success */
-          client->request_offset += r;
-          if (client->request_offset == config->request_size) {
-            /* whole request was sent, start reading */
-            client->state = CLIENT_READING;
-            client_set_events(client, EV_READ);
-          }
-
-          return;
-        } else {
-          /* disconnect */
-          client->state = CLIENT_END;
-          goto start;
-        }
-      }
-    case CLIENT_READING:
-      while (1) {
-        r = read(client->sock_watcher.fd, &client->buffer[client->buffer_offset], sizeof(client->buffer) - client->buffer_offset - 1);
-        
-        //printf("read(): %d, offset was: %d\n", r, client->buffer_offset);
-        if (r == -1) {
-          /* error */
-          if (errno == EINTR)
-            continue;
-          strerror_r(errno, client->buffer, sizeof(client->buffer));
-          W_ERROR("read() failed: %s (%d)", client->buffer, errno);
-          client->state = CLIENT_ERROR;
-        } else if (r != 0) {
-          /* success */
-          client->bytes_received += r;
-          client->buffer_offset += r;
-          client->worker->stats.bytes_total += r;
-
-          if (client->buffer_offset >= sizeof(client->buffer)) {
-            /* too big response header */
-            client->state = CLIENT_ERROR;
-            break;
-          }
-          client->buffer[client->buffer_offset] = '\0';
-          //printf("buffer:\n==========\n%s\n==========\n", client->buffer);
-          if (!client_parse(client, r)) {
-            client->state = CLIENT_ERROR;
-            //printf("parser failed\n");
-            break;
-          } else {
-            if (client->state == CLIENT_END)
-              goto start;
-            else
-              return;
-          }
-        } else {
-          /* disconnect */
-          if (client->parser_state == PARSER_BODY && !client->keepalive && client->status_success
-            && !client->chunked && client->content_length == -1) {
-            client->success = 1;
-            client->state = CLIENT_END;
-          } else {
-            client->state = CLIENT_ERROR;
-          }
-
-          goto start;
-        }
-      }
-
-    case CLIENT_ERROR:
-      //printf("client error\n");
-      client->worker->stats.req_error++;
-      client->keepalive = 0;
-      client->success = 0;
-      client->state = CLIENT_END;
-    case CLIENT_END:
-      /* update worker stats */
-      client->worker->stats.req_done++;
-
-      if (client->success) {
-        client->worker->stats.req_success++;
-        client->worker->stats.bytes_body += client->bytes_received - client->header_size;
-      } else {
-        client->worker->stats.req_failed++;
-      }
-
-      /* print progress every 10% done */
-      if (client->worker->id == 1 && client->worker->stats.req_done % client->worker->progress_interval == 0) {
-        printf("progress: %3d%% done\n",
-          (int) (client->worker->stats.req_done * 100 / client->worker->stats.req_todo)
-        );
-      }
-
-      if (client->worker->stats.req_started == client->worker->stats.req_todo) {
-        /* this worker has started all requests */
-        client->keepalive = 0;
-        client_reset(client);
-
-        if (client->worker->stats.req_done == client->worker->stats.req_todo) {
-          /* this worker has finished all requests */
-          ev_unref(client->worker->loop);
-        }
-      } else {
-        client_reset(client);
-        goto start;
-      }
-  }
-}
-
-
-static uint8_t client_parse(Client *client, int size) {
-  char *end, *str;
-  uint16_t status_code;
-  const int MAX_BUFF = 2048;
-  char* print_buff = malloc(MAX_BUFF);
-  int buff_length = 0;
-
-  switch (client->parser_state) {
-    case PARSER_START:
-      //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "parse (START):\n%s\n", &client->buffer[client->parser_offset]);
-
-      /* look for HTTP/1.1 200 OK */
-      if (client->buffer_offset < sizeof("HTTP/1.1 200\r\n")) {
-        buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "error 1\n", client->buffer_offset);
-        printf(print_buff);
-        return 1;
-      }
-
-      if (strncmp(client->buffer, "HTTP/1.1 ", sizeof("HTTP/1.1 ")-1) != 0) {
-        //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 1\n");
-        printf(print_buff);
-        return 0;
-      }
-
-      // now the status code
-      status_code = 0;
-      str = client->buffer + sizeof("HTTP/1.1 ")-1;
-      for (end = str + 3; str != end; str++) {
-        if (*str < '0' || *str > '9') {
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 2\n");
-          printf(print_buff);
-          return 0;
-        }
-
-        status_code *= 10;
-        status_code += *str - '0';
-      }
-
-      if (status_code >= 200 && status_code < 300) {
-        client->worker->stats.req_2xx++;
-        client->status_success = 1;
-      } else if (status_code < 400) {
-        client->worker->stats.req_3xx++;
-        client->status_success = 1;
-      } else if (status_code < 500) {
-        client->worker->stats.req_4xx++;
-      } else if (status_code < 600) {
-        client->worker->stats.req_5xx++;
-      } else {
-        // invalid status code
-        //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 3\n");
-        printf(print_buff);
-        return 0;
-      }
-
-      // look for next \r\n
-      end = strchr(end, '\r');
-      if (!end || *(end+1) != '\n') {
-        //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 4\n");
-        printf(print_buff);
-        return 0;
-      }
-
-      client->parser_offset = end + 2 - client->buffer;
-      client->parser_state = PARSER_HEADER;
-    case PARSER_HEADER:
-      //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "parse (HEADER)\n");
-      /* look for Content-Length and Connection header */
-      while (NULL != (end = strchr(&client->buffer[client->parser_offset], '\r'))) {
-        if (*(end+1) != '\n') {
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 5\n");
-          printf(print_buff);
-          return 0;
-        }
-
-        if (end == &client->buffer[client->parser_offset]) {
-          /* body reached */
-          client->parser_state = PARSER_BODY;
-          client->header_size = end + 2 - client->buffer;
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "body reached\n");
-
-          return client_parse(client, size - client->header_size);
-        }
-
-        *end = '\0';
-        str = &client->buffer[client->parser_offset];
-        //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "checking header: '%s'\n", str);
-
-        if (strncasecmp(str, "Content-Length: ", sizeof("Content-Length: ")-1) == 0) {
-          /* content length header */
-          client->content_length = str_to_uint64(str + sizeof("Content-Length: ") - 1);
-        } else if (strncasecmp(str, "Connection: ", sizeof("Connection: ")-1) == 0) {
-          /* connection header */
-          str += sizeof("Connection: ") - 1;
-
-          if (strncasecmp(str, "close", sizeof("close")-1) == 0)
-            client->keepalive = 0;
-          else if (strncasecmp(str, "keep-alive", sizeof("keep-alive")-1) == 0)
-            client->keepalive = client->worker->config->keep_alive;
-          else {
-            //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 6\n");
-            printf(print_buff);
-            return 0;
-          }
-        } else if (strncasecmp(str, "Transfer-Encoding: ", sizeof("Transfer-Encoding: ")-1) == 0) {
-          /* transfer encoding header */
-          str += sizeof("Transfer-Encoding: ") - 1;
-
-          if (strncasecmp(str, "chunked", sizeof("chunked")-1) == 0)
-            client->chunked = 1;
-          else {
-            //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 7\n");
-            printf(print_buff);
-            return 0;
-          }
-        }
-
-
-        if (*(end+2) == '\r' && *(end+3) == '\n') {
-          /* body reached */
-          client->parser_state = PARSER_BODY;
-          client->header_size = end + 4 - client->buffer;
-          client->parser_offset = client->header_size;
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "body reached\n");
-
-          return client_parse(client, size - client->header_size);
-        }
-
-        client->parser_offset = end - client->buffer + 2;
-      }
-      buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "error 2\n");
-      printf(print_buff);
-      return 1;
-    case PARSER_BODY:
-      //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "parse (BODY)\n");
-      /* do nothing, just consume the data */
-      /*buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "content-l: %"PRIu64", header: %d, recevied: %"PRIu64"\n",
-      client->content_length, client->header_size, client->bytes_received);*/
-
-      if (client->chunked) {
-        int consume_max;
-
-        str = &client->buffer[client->parser_offset];
-        /*buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "parsing chunk: '%s'\n(%"PRIi64" received, %"PRIi64" size, %d parser offset)\n",
-          str, client->chunk_received, client->chunk_size, client->parser_offset
-        );*/
-
-        if (client->chunk_size == -1) {
-          /* read chunk size */
-          client->chunk_size = 0;
-          client->chunk_received = 0;
-          end = str + size;
-
-          for (; str < end; str++) {
-            if (*str == ';' || *str == '\r')
-              break;
-
-            client->chunk_size *= 16;
-            if (*str >= '0' && *str <= '9')
-              client->chunk_size += *str - '0';
-            else if (*str >= 'A' && *str <= 'Z')
-              client->chunk_size += 10 + *str - 'A';
-            else if (*str >= 'a' && *str <= 'z')
-              client->chunk_size += 10 + *str - 'a';
-            else {
-              //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 8\n");
-              printf(print_buff);
-              return 0;
-            }
-          }
-
-          str = strstr(str, "\r\n");
-          if (!str) {
-            //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 9\n");
-            printf(print_buff);
-            return 0;
-          }
-          str += 2;
-
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "---------- chunk size: %"PRIi64", %d read, %d offset, data: '%s'\n", client->chunk_size, size, client->parser_offset, str);
-
-          if (client->chunk_size == 0) {
-            /* chunk of size 0 marks end of content body */
-            client->state = CLIENT_END;
-            client->success = client->status_success ? 1 : 0;
-            if(client->success == 0) {
-              buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "error 3\n");
-            }
-            printf(print_buff);
-            return 1;
-          }
-
-          size -= str - &client->buffer[client->parser_offset];
-          client->parser_offset = str - client->buffer;
-        }
-
-        /* consume chunk till chunk_size is reached */
-        consume_max = client->chunk_size - client->chunk_received;
-
-        if (size < consume_max)
-          consume_max = size;
-
-        client->chunk_received += consume_max;
-        client->parser_offset += consume_max;
-
-        //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "---------- chunk consuming: %d, received: %"PRIi64" of %"PRIi64", offset: %d\n", consume_max, client->chunk_received, client->chunk_size, client->parser_offset);
-
-        if (client->chunk_received == client->chunk_size) {
-          if (client->buffer[client->parser_offset] != '\r' || client->buffer[client->parser_offset+1] != '\n') {
-            // TE: This was causing problems with resin, which was artificially slowing down the results of some java tests
-            //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 10\n");
-            //printf(print_buff);
-            //return 0;
-          }
-
-          /* got whole chunk, next! */
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "---------- got whole chunk!!\n");
-          client->chunk_size = -1;
-          client->chunk_received = 0;
-          client->parser_offset += 2;
-          consume_max += 2;
-
-          /* there is stuff left to parse */
-          if (size - consume_max > 0)
-            return client_parse(client, size - consume_max);
-        }
-
-        client->parser_offset = 0;
-        client->buffer_offset = 0;
-
-        //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "error 4\n");
-        printf(print_buff);
-        return 1;
-      } else {
-        /* not chunked, just consume all data till content-length is reached */
-        client->buffer_offset = 0;
-
-        if (client->content_length == -1) {
-          //buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "success 11\n");
-          printf(print_buff);
-          return 0;
-        }
-
-        if (client->bytes_received == (uint64_t) (client->header_size + client->content_length)) {
-          /* full response received */
-          client->state = CLIENT_END;
-          client->success = client->status_success ? 1 : 0;
-        }
-      }
-      buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "error 5\n");
-      printf(print_buff);
-      return 1;
-  }
-  buff_length += snprintf(print_buff+buff_length, MAX_BUFF-buff_length, "error 6\n");
-  printf(print_buff);
-  return 1;
-}

config/database_sftp_batch

@@ -1,19 +0,0 @@
-lcd ..
-put config/my.cnf
-put config/mongodb.conf
-put config/create.sql
-put config/create.js
-put config/create-postgres-database.sql
-put config/create-postgres.sql
-put config/postgresql.conf
-put config/pg_hba.conf
-put config/usr.sbin.mysqld
-put config/60-postgresql-shm.conf
-put config/mysql
-put config/mysql.conf
--mkdir cassandra
-put -r config/cassandra
--mkdir elasticsearch
-put -r config/elasticsearch
-put config/redis.conf
-put config/create-redis.sh

config/erlang.list

@@ -1 +0,0 @@
-deb http://packages.erlang-solutions.com/debian trusty contrib

config/ports.conf

@@ -1,23 +0,0 @@
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default
-# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
-# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
-# README.Debian.gz
-
-NameVirtualHost *:80
-Listen 80
-Listen 8080
-
-<IfModule mod_ssl.c>
-    # If you add NameVirtualHost *:443 here, you will also have to change
-    # the VirtualHost statement in /etc/apache2/sites-available/default-ssl
-    # to <VirtualHost *:443>
-    # Server Name Indication for SSL named virtual hosts is currently not
-    # supported by MSIE on Windows XP.
-    Listen 443
-</IfModule>
-
-<IfModule mod_gnutls.c>
-    Listen 443
-</IfModule>

config/upstart.example/tfb.conf

@@ -1,19 +0,0 @@
-# /etc/init/tfb.conf
-env TFB_REPOPARENT="/private"
-env TFB_REPONAME="FrameworkBenchmarks"
-env TFB_REPOURI="https://github.com/ashawnbandy-te-tfb/FrameworkBenchmarks.git"
-env TFB_MAILINGLIST="[email protected]"
-env TFB_MAILING_FROM="[email protected]"
-env TFB_LOGSFOLDER="/private/logs"
-env TFB_REPOBRANCH="45216-continuousbenchmarking-20160609-asb-2"
-setuid techempower
-setgid techempower
-umask 0002
-respawn
-respawn limit 5 2
-script
-  if [ ! -d "$TFB_REPOPARENT/$TFB_REPONAME" ]; then
-    git clone -b $TFB_REPOBRANCH $TFB_REPOURI $TFB_REPOPARENT/$TFB_REPONAME
-  fi
-  exec /$TFB_REPOPARENT/$TFB_REPONAME/toolset/run-continuously.sh
-end script

frameworks/PHP/README.md

@@ -76,7 +76,7 @@ containing these lines (comments added to clarify what's happening). `fw_depends
     #   - php-fpm configuration is located in the config folder found in the 
     #     root of this project
     #   - We tell PHP-FPM to place it's PID file into the deploy folder
-    $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+    $PHP_FPM --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
     # Turn on nginx using the configuration file found in this framework's deploy
     # folder
     $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/cakephp/setup.sh

@@ -2,7 +2,7 @@
 
 fw_depends mysql php5 composer nginx
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 
 sed -i "s|'host' => '.*'|'host' => '${DBHOST}'|g" app/Config/database.php
 sed -i 's|REDISSERVER|'${DBHOST}'|g' app/Config/core.php

frameworks/PHP/clancats/setup.sh

@@ -14,5 +14,5 @@ cp -r app/ clancatsapp/CCF/
 
 cp -r vendor/ clancatsapp/CCF/
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/codeigniter/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-codeigniter|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/cygnite/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|127.0.0.1|'"${DBHOST}"'|g' apps/configs/database.php
 sed -i 's|root .*/FrameworkBenchmarks/cygnite|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c ${TROOT}/deploy/nginx.conf

frameworks/PHP/fat-free/setup.sh

@@ -16,5 +16,5 @@ pushd "$F3DIR" > /dev/null
 git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
 popd > /dev/null
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/fuel/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' fuel/app/config/production/db.php
 sed -i 's|root .*/FrameworkBenchmarks/php-fuel|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/kohana/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-kohana|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/limonade/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/limonade|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/lithium/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|192.168.100.102|'"${DBHOST}"'|g' app/config/bootstrap/connections.php
 sed -i 's|root .*/FrameworkBenchmarks/php-lithium|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/lumen/setup.sh

@@ -12,5 +12,5 @@ rm vendor/laravel/lumen-framework/src/Application.php
 cp modifiedVendorFiles/Application.php vendor/laravel/lumen-framework/src/
 touch vendor/laravel/lumen-framework/storage/logs/lumen.log
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/phalcon-micro/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' public/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-phalcon-micro|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/phalcon/setup.sh

@@ -7,5 +7,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' app/config/config.php
 sed -i 's|root .*/FrameworkBenchmarks/php-phalcon|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php/setup.sh

@@ -12,5 +12,5 @@ sed -i "s|TEST_ROOT|${TROOT}|g" deploy/nginx.conf
 
 sed -i "s|/usr/local/nginx/|${IROOT}/nginx/|g" deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/php/setup_php5.sh

@@ -12,5 +12,5 @@ sed -i "s|TEST_ROOT|${TROOT}|g" deploy/nginx.conf
 
 sed -i "s|/usr/local/nginx/|${IROOT}/nginx/|g" deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/phpixie/setup.sh

@@ -8,5 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-phpixie|Directory '"${TROOT}"'|g'
 sed -i 's|root .*/FrameworkBenchmarks/php-phpixie|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/phreeze/setup.sh

@@ -8,5 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/phreeze|Directory '"${TROOT}"'|g' dep
 sed -i 's|root .*/FrameworkBenchmarks/phreeze|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/pimf/setup.sh

@@ -9,5 +9,5 @@ sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/php-p
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/pimf/setup_raw.sh

@@ -9,5 +9,5 @@ sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/php-p
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx_raw.conf
 sed -i 's|root .*/FrameworkBenchmarks/php-pimf|root '"${TROOT}"'|g' deploy/nginx_raw.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx_raw.conf

frameworks/PHP/silex-orm/setup.sh

@@ -8,5 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-silex-orm|Directory '"${TROOT}"'|
 sed -i 's|root .*/FrameworkBenchmarks/php-silex-orm|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/silex/setup.sh

@@ -8,5 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-silex|Directory '"${TROOT}"'|g' d
 sed -i 's|root .*/FrameworkBenchmarks/php-silex|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/silex/setup_raw.sh

@@ -8,5 +8,5 @@ sed -i 's|Directory .*/FrameworkBenchmarks/php-silex|Directory '"${TROOT}"'|g' d
 sed -i 's|root .*/FrameworkBenchmarks/php-silex|root '"${TROOT}"'|g' deploy/nginx_raw.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx_raw.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx_raw.conf

frameworks/PHP/slim/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-slim| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/slim/setup_php5.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-slim| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/symfony2-stripped/setup.sh

@@ -9,5 +9,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 php app/console cache:clear --env=prod --no-debug --no-warmup
 php app/console cache:warmup --env=prod --no-debug
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/symfony2/setup.sh

@@ -9,5 +9,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 php app/console cache:clear --env=prod --no-debug --no-warmup
 php app/console cache:warmup --env=prod --no-debug
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/yaf/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|host=localhost|host='"${DBHOST}"'|g' app/conf/application.ini
 sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf 
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/yii2/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-yii2|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/zend/setup.sh

@@ -6,7 +6,7 @@ sed -i 's|host=localhost|host='"${DBHOST}"'|g' config/autoload/benchmarks.local.
 sed -i 's|root .*/FrameworkBenchmarks/php-zend-framework|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf 
 
 mkdir -p data/cache

frameworks/PHP/zend1/setup.sh

@@ -6,5 +6,5 @@ sed -i 's|host = "localhost"|host = "'"${DBHOST}"'"|g' application/configs/appli
 sed -i 's|root .*/FrameworkBenchmarks/php-zend-framework1|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+php-fpm --fpm-config $FWROOT/toolset/setup/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 nginx -c $TROOT/deploy/nginx.conf

toolset/benchmark/framework_test.py

@@ -171,7 +171,7 @@ class FrameworkTest:
     # Setup environment variables
     logDir = os.path.join(self.fwroot, self.benchmarker.full_results_directory(), 'logs', self.name.lower())
     bash_functions_path= os.path.join(self.fwroot, 'toolset/setup/linux/bash_functions.sh')
-    setup_util.replace_environ(config='$FWROOT/config/benchmark_profile',
+    setup_util.replace_environ(config='$FWROOT/toolset/setup/linux/config/benchmark_profile',
               command='''\
               export TROOT=%s       &&  \
               export IROOT=%s       &&  \

toolset/run-tests.py

@@ -66,7 +66,7 @@ def main(argv=None):
     fwroot = setup_util.get_fwroot()
     if not fwroot: 
         fwroot = os.getcwd()
-    setup_util.replace_environ(config='config/benchmark_profile', root=fwroot)
+    setup_util.replace_environ(config='toolset/setup/linux/config/benchmark_profile', root=fwroot)
     print "FWROOT is %s"%setup_util.get_fwroot()
 
     conf_parser = argparse.ArgumentParser(

toolset/setup/linux/bash_functions.sh

@@ -114,29 +114,14 @@ fw_depends() {
     # Note: A shebang is just a comment when you source a script, 
     #       so if you need to modify the default options use  
     #       `set -e` instead of `#!/bin/bash -e`
-    if [ -f $FWROOT/toolset/setup/linux/systools/${depend}.sh ]; then
-      echo Installing system tool: $depend in $relative_wd
+    installation_file=$( find ${FWROOT}/toolset/setup/linux -name ${depend}.sh )
+    if [[ -n $installation_file ]]; then
+      echo Installing dependency: $depend from $installation_file
       set -x
-      . $FWROOT/toolset/setup/linux/systools/${depend}.sh
-    elif [ -f $FWROOT/toolset/setup/linux/languages/${depend}.sh ]; then
-      echo Installing language: $depend in $relative_wd
-      set -x
-      . $FWROOT/toolset/setup/linux/languages/${depend}.sh
-    elif [ -f $FWROOT/toolset/setup/linux/webservers/${depend}.sh ]; then
-      echo Installing webserver: $depend in $relative_wd
-      set -x
-      . $FWROOT/toolset/setup/linux/webservers/${depend}.sh
-    elif [ -f $FWROOT/toolset/setup/linux/frameworks/${depend}.sh ]; then
-      echo Installing framework: $depend in $relative_wd
-      set -x
-      . $FWROOT/toolset/setup/linux/frameworks/${depend}.sh
-    elif [ -f $FWROOT/toolset/setup/linux/databases/${depend}.sh ]; then
-      echo Installing database: $depend in $relative_wd
-      set -x
-      . $FWROOT/toolset/setup/linux/databases/${depend}.sh
+      . $installation_file
     else
       echo WARN: No installer found for $depend, attempting to install with 'apt-get'...
-      sudo apt-get install -o Dpkg::Options::="--force-confold --force-confdef" --force-yes ${depend}
+      sudo apt-get install -o Dpkg::Options::="--force-confold" Dpkg::Options::="--force-confdef" --force-yes ${depend}
       # Return whence you came.
       popd
       continue

toolset/setup/linux/databases/mongodb.sh → toolset/setup/linux/databases/mongodb/mongodb.sh

@@ -8,8 +8,8 @@ RETCODE=$(fw_exists ${IROOT}/mongodb.installed)
   return 0; }
 
 # send over the required files
-scp $FWROOT/config/mongodb.conf $DBHOST:~/
-scp $FWROOT/config/create.js $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mongodb/mongodb.conf $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mongodb/create.js $DBHOST:~/
 
 # install mongo on database machine
 ssh $DBHOST 'bash' <<EOF

toolset/setup/linux/databases/mysql.sh → toolset/setup/linux/databases/mysql/mysql.sh

@@ -8,11 +8,11 @@ RETCODE=$(fw_exists ${IROOT}/mysql.installed)
   return 0; }
 
 # send over the required files
-scp $FWROOT/config/create.sql $DBHOST:~/
-scp $FWROOT/config/mysql $DBHOST:~/
-scp $FWROOT/config/mysql.conf $DBHOST:~/
-scp $FWROOT/config/my.cnf $DBHOST:~/
-scp $FWROOT/config/usr.sbin.mysqld $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mysql/create.sql $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mysql/mysql $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mysql/mysql.conf $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mysql/my.cnf $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/mysql/usr.sbin.mysqld $DBHOST:~/
 
 # install mysql on database machine
 ssh $DBHOST 'bash' <<EOF

toolset/setup/linux/databases/postgresql.sh → toolset/setup/linux/databases/postgresql/postgresql.sh

@@ -15,11 +15,11 @@ ssh $DBHOST 'bash' <<EOF
 EOF
 
 # send over the required files
-scp $FWROOT/config/postgresql.conf $DBHOST:~/
-scp $FWROOT/config/pg_hba.conf $DBHOST:~/
-scp $FWROOT/config/60-postgresql-shm.conf $DBHOST:~/
-scp $FWROOT/config/create-postgres-database.sql $DBHOST:~/
-scp $FWROOT/config/create-postgres.sql $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/postgresql/postgresql.conf $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/postgresql/pg_hba.conf $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/postgresql/60-postgresql-shm.conf $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/postgresql/create-postgres-database.sql $DBHOST:~/
+scp $FWROOT/toolset/setup/linux/databases/postgresql/create-postgres.sql $DBHOST:~/
 
 ssh $DBHOST 'bash' <<EOF
 # install postgresql on database machine

toolset/setup/linux/databases/redis/README.md

@@ -0,0 +1 @@
+# redis is not currently implemented

toolset/setup/linux/languages/php5.sh → toolset/setup/linux/languages/php/php5.sh

@@ -3,8 +3,8 @@
 RETCODE=$(fw_exists ${IROOT}/php5.installed)
 [ ! "$RETCODE" == 0 ] || { \
   echo "Moving PHP config files into place"; 
-  sudo cp $FWROOT/config/php.ini /usr/local/lib/php.ini
-  sudo cp $FWROOT/config/php-fpm.conf /usr/local/lib/php-fpm.conf
+  sudo cp $FWROOT/toolset/setup/languages/php/php.ini /usr/local/lib/php.ini
+  sudo cp $FWROOT/toolset/setup/languages/php/php-fpm.conf /usr/local/lib/php-fpm.conf
   source $IROOT/php5.installed
   return 0; }
 
@@ -32,15 +32,15 @@ cd ..
 
 # Disable yaf and phalcon, for most PHP frameworks 
 # (there is a similar line to enable the frameworks in their respective setup files)
-sed -i 's|^extension=yaf.so|;extension=yaf.so|g' $FWROOT/config/php.ini
-sed -i 's|^extension=phalcon.so|;extension=phalcon.so|g' $FWROOT/config/php.ini
+sed -i 's|^extension=yaf.so|;extension=yaf.so|g' $FWROOT/toolset/setup/languages/php/php.ini
+sed -i 's|^extension=phalcon.so|;extension=phalcon.so|g' $FWROOT/toolset/setup/languages/php/php.ini
 
 # Enable the correct Mongo DB plugin for PHP 5
-sed -i 's|^extension=mongodb.so|;extension=mongodb.so|g' $FWROOT/config/php.ini
-sed -i 's|;extension=mongo.so|extension=mongo.so|g' $FWROOT/config/php.ini
+sed -i 's|^extension=mongodb.so|;extension=mongodb.so|g' $FWROOT/toolset/setup/languages/php/php.ini
+sed -i 's|;extension=mongo.so|extension=mongo.so|g' $FWROOT/toolset/setup/languages/php/php.ini
 
-cp $FWROOT/config/php.ini $PHP_HOME/lib/php.ini
-cp $FWROOT/config/php-fpm.conf $PHP_HOME/lib/php-fpm.conf
+cp $FWROOT/toolset/setup/languages/php/php.ini $PHP_HOME/lib/php.ini
+cp $FWROOT/toolset/setup/languages/php/php-fpm.conf $PHP_HOME/lib/php-fpm.conf
 
 # =======================
 #

toolset/setup/linux/languages/php7.sh → toolset/setup/linux/languages/php/php7.sh

@@ -27,15 +27,15 @@ cd ..
 
 # Disable yaf and phalcon, for most PHP frameworks
 # (there is a similar line to enable the frameworks in their respective setup files)
-sed -i 's|^extension=yaf.so|;extension=yaf.so|g' $FWROOT/config/php.ini
-sed -i 's|^extension=phalcon.so|;extension=phalcon.so|g' $FWROOT/config/php.ini
+sed -i 's|^extension=yaf.so|;extension=yaf.so|g' $FWROOT/toolset/setup/languages/php/php.ini
+sed -i 's|^extension=phalcon.so|;extension=phalcon.so|g' $FWROOT/toolset/setup/languages/php/php.ini
 
 # Enable the correct Mongo DB plugin for PHP 7
-sed -i 's|^extension=mongo.so|;extension=mongo.so|g' $FWROOT/config/php.ini
-sed -i 's|;extension=mongodb.so|extension=mongodb.so|g' $FWROOT/config/php.ini
+sed -i 's|^extension=mongo.so|;extension=mongo.so|g' $FWROOT/toolset/setup/languages/php/php.ini
+sed -i 's|;extension=mongodb.so|extension=mongodb.so|g' $FWROOT/toolset/setup/languages/php/php.ini
 
-cp $FWROOT/config/php.ini $PHP_HOME/lib/php.ini
-cp $FWROOT/config/php-fpm.conf $PHP_HOME/lib/php-fpm.conf
+cp $FWROOT/toolset/setup/languages/php/php.ini $PHP_HOME/lib/php.ini
+cp $FWROOT/toolset/setup/languages/php/php-fpm.conf $PHP_HOME/lib/php-fpm.conf
 
 # =======================
 #

toolset/setup/linux/webservers/resin.sh → toolset/setup/linux/webservers/resin/resin.sh

@@ -21,10 +21,10 @@ make
 make install
 
 mv conf/resin.properties conf/resin.properties.orig
-cat $FWROOT/config/resin.properties > conf/resin.properties
+cat $FWROOT/toolset/setup/linux/webservers/resin/resin.properties > conf/resin.properties
 
 mv conf/resin.xml conf/resin.xml.orig
-cat $FWROOT/config/resin.xml > conf/resin.xml
+cat $FWROOT/toolset/setup/linux/webservers/resin/resin.xml > conf/resin.xml
 
 echo "export RESIN_HOME=${RESIN_HOME}" > $IROOT/resin.installed
 echo -e "export PATH=\$RESIN_HOME/bin:\$PATH" >> $IROOT/resin.installed