Browse Source

Merge branch 'master' of https://github.com/xaxaxa/FrameworkBenchmarks into 778

mcoccia 11 years ago
parent
commit
6d144bf019
3 changed files with 21 additions and 7 deletions
  1. 7 3
      cpoll_cppsp/www/db
  2. 7 2
      cpoll_cppsp/www/db_pg_async
  3. 7 2
      cpoll_cppsp/www/db_pg_threadpool

+ 7 - 3
cpoll_cppsp/www/db

@@ -128,8 +128,9 @@ void efdCB(eventfd_t efdVal) {
 void waitCB(eventfd_t efdVal) {
 	this->doInit();
 }
-
-%>[<%
+if(queries>1) {
+	%>[<%
+}
 for (int i=0;i<queries;i++){
 	if(i>0) output.write(',');
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
@@ -137,4 +138,7 @@ for (int i=0;i<queries;i++){
 
 response->headers["Content-Type"]="application/json";
 response->headers["Server"]="cppsp/0.2";
-%>]
+if(queries>1) {
+	%>]<%
+}
+%>

+ 7 - 2
cpoll_cppsp/www/db_pg_async

@@ -108,7 +108,9 @@ void evtIn(int) {
 	beginGetItems();
 }
 
-%>[<%
+if(queries>1) {
+	%>[<%
+}
 for (int i=0;i<queries;i++){
 	if(i>0) output.write(',');
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
@@ -116,4 +118,7 @@ for (int i=0;i<queries;i++){
 
 response->headers["Content-Type"]="application/json";
 response->headers["Server"]="cppsp/0.2";
-%>]
+if(queries>1) {
+	%>]<%
+}
+%>

+ 7 - 2
cpoll_cppsp/www/db_pg_threadpool

@@ -95,7 +95,9 @@ void waitCB(eventfd_t efdVal) {
 	this->doInit();
 }
 
-%>[<%
+if(queries>1) {
+	%>[<%
+}
 for (int i=0;i<queries;i++){
 	if(i>0) output.write(',');
 	%>{"id":<%=items[i].id%>,"randomNumber":<%=items[i].rnd%>}<%
@@ -103,4 +105,7 @@ for (int i=0;i<queries;i++){
 
 response->headers["Content-Type"]="application/json";
 response->headers["Server"]="cppsp/0.2";
-%>]
+if(queries>1) {
+	%>]<%
+}
+%>