Browse Source

Django: Add django-py3(242)

INADA Naoki 12 years ago
parent
commit
e945892398
4 changed files with 51 additions and 1 deletions
  1. 10 0
      django/benchmark_config
  2. 5 1
      django/hello/world/views.py
  3. 2 0
      django/setup.py
  4. 34 0
      django/setup_py3.py

+ 10 - 0
django/benchmark_config

@@ -10,6 +10,16 @@
       "update_url": "/update?queries=",
       "port": 8080,
       "sort": 3
+    },
+    "py3": {
+      "setup_file": "setup_py3",
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/db?queries=",
+      "fortune_url": "/fortunes",
+      "update_url": "/update?queries=",
+      "port": 8080,
+      "sort": 242
     }
   }]
 }

+ 5 - 1
django/hello/world/views.py

@@ -7,9 +7,13 @@ from world.models import World, Fortune
 from django.shortcuts import render
 from ujson import dumps as uj_dumps
 import random
+import sys
 from operator import attrgetter
 from functools import partial
 
+if sys.version_info[0] == 3:
+  xrange = range
+
 def json(request):
   response = {
     "message": "Hello, World!"
@@ -54,7 +58,7 @@ def fortunes(request):
 def update(request):
   queries = int(request.GET.get('queries', 1))
   g = World.objects.get
-  rp = partial(nprnd.randint, 1, 10000)
+  rp = partial(random.randint, 1, 10000)
   
   worlds = []
   for r in [rp() for q in xrange(queries)]:

+ 2 - 0
django/setup.py

@@ -3,6 +3,7 @@ import setup_util
 import multiprocessing
 import os
 
+home = os.path.expanduser('~')
 bin_dir = os.path.expanduser('~/FrameworkBenchmarks/installs/py2/bin')
 NCPU = multiprocessing.cpu_count()
 
@@ -10,6 +11,7 @@ proc = None
 
 
 def start(args):
+    global proc
     setup_util.replace_text("django/hello/hello/settings.py", "HOST': '.*'", "HOST': '" + args.database_host + "'")
     setup_util.replace_text("django/hello/hello/settings.py", "\/home\/ubuntu",  home)
     proc = subprocess.Popen([

+ 34 - 0
django/setup_py3.py

@@ -0,0 +1,34 @@
+import subprocess
+import setup_util
+import multiprocessing
+import os
+
+home = os.path.expanduser('~')
+bin_dir = os.path.expanduser('~/FrameworkBenchmarks/installs/py3/bin')
+NCPU = multiprocessing.cpu_count()
+
+proc = None
+
+
+def start(args):
+    global proc
+    setup_util.replace_text("django/hello/hello/settings.py", "HOST': '.*'", "HOST': '" + args.database_host + "'")
+    setup_util.replace_text("django/hello/hello/settings.py", "\/home\/ubuntu",  home)
+    proc = subprocess.Popen([
+        bin_dir + "/gunicorn",
+        "hello.wsgi:application",
+        "-k", "meinheld.gmeinheld.MeinheldWorker",
+        "-b", "0.0.0.0:8080",
+        '-w', str(NCPU*3),
+        "--log-level=critical"],
+        cwd="django/hello")
+    return 0
+
+def stop():
+    global proc
+    if proc is None:
+        return 0
+    proc.terminate()
+    proc.wait()
+    proc = None
+    return 0