Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #1857 from valyala/master

fasthttp: small fixes and improvements
Mike Smith 9 years ago
parent
25ef967d86 ab8c3c24db
commit
999cc6d033
7 changed files with 81 additions and 48 deletions
Unified View Show Diff Stats
  1. 19 2
      frameworks/Go/fasthttp-mysql/src/hello/hello.go
  2. 10 10
      frameworks/Go/fasthttp-mysql/templates/fortune.html
  3. 0 9
      frameworks/Go/fasthttp-mysql/templates/layout.html
  4. 1 1
      frameworks/Go/fasthttp-postgresql/benchmark_config.json
  5. 41 7
      frameworks/Go/fasthttp-postgresql/src/hello/hello.go
  6. 10 10
      frameworks/Go/fasthttp-postgresql/templates/fortune.html
  7. 0 9
      frameworks/Go/fasthttp-postgresql/templates/layout.html

+ 19 - 2
frameworks/Go/fasthttp-mysql/src/hello/hello.go
View File 

@@ -12,6 +12,8 @@ import (
 
 	"os/exec"
 
 	"os/exec"
 
 	"runtime"
 
 	"runtime"
 
 	"sort"
 
 	"sort"
 
+	"sync/atomic"
 
+	"time"
 
 
 
 	_ "github.com/go-sql-driver/mysql"
 
 	_ "github.com/go-sql-driver/mysql"
 
 	"github.com/valyala/fasthttp"
 
 	"github.com/valyala/fasthttp"
 
@@ -47,7 +49,7 @@ var (
 
 const helloWorldString = "Hello, World!"
 
 const helloWorldString = "Hello, World!"
 
 
 
 var (
 
 var (
 
-	tmpl = template.Must(template.ParseFiles("templates/layout.html", "templates/fortune.html"))
 
+	tmpl = template.Must(template.ParseFiles("templates/fortune.html"))
 
 
 
 	db *sql.DB
 
 	db *sql.DB
 
 
 
@@ -76,7 +78,7 @@ func main() {
 
 		dbConnCount = (dbConnCount + runtime.NumCPU() - 1) / runtime.NumCPU()
 
 		dbConnCount = (dbConnCount + runtime.NumCPU() - 1) / runtime.NumCPU()
 
 	}
 
 	}
 
 	db.SetMaxIdleConns(dbConnCount)
 
 	db.SetMaxIdleConns(dbConnCount)
 
-	db.SetMaxOpenConns(dbConnCount * 2)
 
+	db.SetMaxOpenConns(dbConnCount)
 
 
 
 	worldSelectStmt = mustPrepare(db, "SELECT id, randomNumber FROM World WHERE id = ?")
 
 	worldSelectStmt = mustPrepare(db, "SELECT id, randomNumber FROM World WHERE id = ?")
 
 	worldUpdateStmt = mustPrepare(db, "UPDATE World SET randomNumber = ? WHERE id = ?")
 
 	worldUpdateStmt = mustPrepare(db, "UPDATE World SET randomNumber = ? WHERE id = ?")
 
@@ -92,7 +94,22 @@ func main() {
 
 	}
 
 	}
 
 }
 
 }
 
 
 
+const maxConnDuration = time.Millisecond * 200
 
+
 
+var connDurationJitter uint64
 
+
 
 func mainHandler(ctx *fasthttp.RequestCtx) {
 
 func mainHandler(ctx *fasthttp.RequestCtx) {
 
+	// Performance hack for prefork mode - periodically close keepalive
 
+	// connections for evenly distributing connections among available
 
+	// processes.
 
+	if *prefork {
 
+		maxDuration := maxConnDuration + time.Millisecond*time.Duration(atomic.LoadUint64(&connDurationJitter))
 
+		if time.Since(ctx.ConnTime()) > maxDuration {
 
+			atomic.StoreUint64(&connDurationJitter, uint64(rand.Intn(100)))
 
+			ctx.SetConnectionClose()
 
+		}
 
+	}
 
+
 
 	path := ctx.Path()
 
 	path := ctx.Path()
 
 	switch string(path) {
 
 	switch string(path) {
 
 	case "/plaintext":
 
 	case "/plaintext":

+ 10 - 10
frameworks/Go/fasthttp-mysql/templates/fortune.html
View File 

@@ -1,14 +1,14 @@
 
-{{define "content"}}
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+<title>Fortunes</title>
 
+</head>
 
+<body>
 
 <table>
 
 <table>
 
-<tr>
 
-<th>id</th>
 
-<th>message</th>
 
-</tr>
 
+<tr><th>id</th><th>message</th></tr>
 
 {{range .}}
 
 {{range .}}
 
-<tr>
 
-<td>{{.Id}}</td>
 
-<td>{{.Message}}</td>
 
-</tr>
 
+<tr><td>{{.Id}}</td><td>{{.Message}}</td></tr>
 
 {{end}}
 
 {{end}}
 
 </table>
 
 </table>
 
-{{end}}
 
+</body>
 
+</html>

+ 0 - 9
frameworks/Go/fasthttp-mysql/templates/layout.html
View File 

@@ -1,9 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-<title>Fortunes</title>
 
-</head>
 
-<body>
 
-{{template "content" .}}
 
-</body>
 
-</html>

+ 1 - 1
frameworks/Go/fasthttp-postgresql/benchmark_config.json
View File 

@@ -43,7 +43,7 @@
 
       "webserver": "None",
 
       "webserver": "None",
 
       "os": "Linux",
 
       "os": "Linux",
 
       "database_os": "Linux",
 
       "database_os": "Linux",
 
-      "display_name": "fasthttp-pg-prefork",
 
+      "display_name": "fasthttp-postgresql-prefork",
 
       "notes": "",
 
       "notes": "",
 
       "versus": "go"
 
       "versus": "go"
 
     }
 
     }

+ 41 - 7
frameworks/Go/fasthttp-postgresql/src/hello/hello.go
View File 

@@ -12,6 +12,8 @@ import (
 
 	"os/exec"
 
 	"os/exec"
 
 	"runtime"
 
 	"runtime"
 
 	"sort"
 
 	"sort"
 
+	"sync/atomic"
 
+	"time"
 
 
 
 	"github.com/jackc/pgx"
 
 	"github.com/jackc/pgx"
 
 	"github.com/valyala/fasthttp"
 
 	"github.com/valyala/fasthttp"
 
@@ -45,10 +47,8 @@ var (
 
 
 
 const helloWorldString = "Hello, World!"
 
 const helloWorldString = "Hello, World!"
 
 
 
-const largerJson = `{status:"0",message:"ok",data:[{item:"car"},{item:"house"},{item:"airplane"},{item:"train"}]}`
 
-
 
 var (
 
 var (
 
-	tmpl = template.Must(template.ParseFiles("templates/layout.html", "templates/fortune.html"))
 
+	tmpl = template.Must(template.ParseFiles("templates/fortune.html"))
 
 
 
 	db *pgx.ConnPool
 
 	db *pgx.ConnPool
 
 
 
@@ -67,7 +67,11 @@ func main() {
 
 	var err error
 
 	var err error
 
 
 
 	// initialize the connection pool
 
 	// initialize the connection pool
 
-	if db, err = initDatabase("localhost", "benchmarkdbuser", "benchmarkdbpass", "hello_world", 5432, maxConnectionCount); err != nil {
 
+	dbConns := maxConnectionCount
 
+	if *prefork {
 
+		dbConns = (maxConnectionCount + runtime.NumCPU() - 1) / runtime.NumCPU()
 
+	}
 
+	if db, err = initDatabase("localhost", "benchmarkdbuser", "benchmarkdbpass", "hello_world", 5432, dbConns); err != nil {
 
 		log.Fatalf("Error opening database: %s", err)
 
 		log.Fatalf("Error opening database: %s", err)
 
 	}
 
 	}
 
 
 
@@ -81,7 +85,22 @@ func main() {
 
 	}
 
 	}
 
 }
 
 }
 
 
 
+const maxConnDuration = time.Millisecond * 200
 
+
 
+var connDurationJitter uint64
 
+
 
 func mainHandler(ctx *fasthttp.RequestCtx) {
 
 func mainHandler(ctx *fasthttp.RequestCtx) {
 
+	// Performance hack for prefork mode - periodically close keepalive
 
+	// connections for evenly distributing connections among available
 
+	// processes.
 
+	if *prefork {
 
+		maxDuration := maxConnDuration + time.Millisecond*time.Duration(atomic.LoadUint64(&connDurationJitter))
 
+		if time.Since(ctx.ConnTime()) > maxDuration {
 
+			atomic.StoreUint64(&connDurationJitter, uint64(rand.Intn(100)))
 
+			ctx.SetConnectionClose()
 
+		}
 
+	}
 
+
 
 	path := ctx.Path()
 
 	path := ctx.Path()
 
 	switch string(path) {
 
 	switch string(path) {
 
 	case "/plaintext":
 
 	case "/plaintext":
 
@@ -145,7 +164,7 @@ func fortuneHandler(ctx *fasthttp.RequestCtx) {
 
 
 
 	sort.Sort(FortunesByMessage(fortunes))
 
 	sort.Sort(FortunesByMessage(fortunes))
 
 
 
-	ctx.SetContentType("text/html")
 
+	ctx.SetContentType("text/html; charset=utf-8")
 
 	if err := tmpl.Execute(ctx, fortunes); err != nil {
 
 	if err := tmpl.Execute(ctx, fortunes); err != nil {
 
 		log.Fatalf("Error executing fortune: %s", err)
 
 		log.Fatalf("Error executing fortune: %s", err)
 
 	}
 
 	}
 
@@ -169,9 +188,24 @@ func updateHandler(ctx *fasthttp.RequestCtx) {
 
 		log.Fatalf("Error starting transaction: %s", err)
 
 		log.Fatalf("Error starting transaction: %s", err)
 
 	}
 
 	}
 
 
 
+	// Disable synchronous commit for the current transaction
 
+	// as a performance optimization.
 
+	// See http://www.postgresql.org/docs/current/static/runtime-config-wal.html for details.
 
+	// Below is the relevant quote from the docs:
 
+	//
 
+	// > It is therefore possible, and useful, to have some transactions
 
+	// > commit synchronously and others asynchronously. For example,
 
+	// > to make a single multistatement transaction commit asynchronously
 
+	// > when the default is the opposite, issue
 
+	// >     SET LOCAL synchronous_commit TO OFF
 
+	// > within the transaction.
 
+	if _, err = txn.Exec("SET LOCAL synchronous_commit TO OFF"); err != nil {
 
+		log.Fatalf("Error when disabling synchronous commit")
 
+	}
 
+
 
 	for i := 0; i < n; i++ {
 
 	for i := 0; i < n; i++ {
 
 		w := &worlds[i]
 
 		w := &worlds[i]
 
-		if _, err := txn.Exec("worldUpdateStmt", w.RandomNumber, w.Id); err != nil {
 
+		if _, err = txn.Exec("worldUpdateStmt", w.RandomNumber, w.Id); err != nil {
 
 			log.Fatalf("Error updating world row %d: %s", i, err)
 
 			log.Fatalf("Error updating world row %d: %s", i, err)
 
 		}
 
 		}
 
 	}
 
 	}
 
@@ -184,7 +218,7 @@ func updateHandler(ctx *fasthttp.RequestCtx) {
 
 
 
 // Test 6: Plaintext
 
 // Test 6: Plaintext
 
 func plaintextHandler(ctx *fasthttp.RequestCtx) {
 
 func plaintextHandler(ctx *fasthttp.RequestCtx) {
 
-	ctx.Success("text/plain", helloWorldBytes)
 
+	ctx.Write(helloWorldBytes)
 
 }
 
 }
 
 
 
 func jsonMarshal(ctx *fasthttp.RequestCtx, v interface{}) {
 
 func jsonMarshal(ctx *fasthttp.RequestCtx, v interface{}) {

+ 10 - 10
frameworks/Go/fasthttp-postgresql/templates/fortune.html
View File 

@@ -1,14 +1,14 @@
 
-{{define "content"}}
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+<title>Fortunes</title>
 
+</head>
 
+<body>
 
 <table>
 
 <table>
 
-<tr>
 
-<th>id</th>
 
-<th>message</th>
 
-</tr>
 
+<tr><th>id</th><th>message</th></tr>
 
 {{range .}}
 
 {{range .}}
 
-<tr>
 
-<td>{{.Id}}</td>
 
-<td>{{.Message}}</td>
 
-</tr>
 
+<tr><td>{{.Id}}</td><td>{{.Message}}</td></tr>
 
 {{end}}
 
 {{end}}
 
 </table>
 
 </table>
 
-{{end}}
 
+</body>
 
+</html>

+ 0 - 9
frameworks/Go/fasthttp-postgresql/templates/layout.html
View File 

@@ -1,9 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-<title>Fortunes</title>
 
-</head>
 
-<body>
 
-{{template "content" .}}
 
-</body>
 
-</html>