Changeset 1594

Timestamp:

06/22/08 09:57:07 (4 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/cherokee/iocache.c (modified) (2 diffs)
• cherokee/trunk/contrib/tracelor.py (modified) (1 diff)
• cherokee/trunk/qa/help.py (modified) (1 diff)
• cherokee/trunk/qa/run-tests.py (modified) (3 diffs)

cherokee/trunk/cherokee/iocache.c

@@ -474 +474 @@
-        if (ret != ret_ok) {
-                if (iocache->files_num >= iocache->files_max) {
+                        TRACE(ENTRIES, "Cache full for '%s'\n", filename->buf);
-                        *ret_file = NULL;
-                        ret = ret_no_sys;
@@ -538 +539 @@
-                if (ret != ret_ok) {
-                        if (iocache->files_num >= iocache->files_max) {
+                                TRACE(ENTRIES, "Cache full for '%s'\n", filename->buf);
+                                *ret_file = NULL;
-                                ret = ret_no_sys;
-                                goto error;

cherokee/trunk/contrib/tracelor.py

@@ -44 +44 @@
-    while True:
-        line = sys.stdin.readline()
-not line
+len(line) < 1
-            break
-

cherokee/trunk/qa/help.py

@@ -14 +14 @@
-
-  -n<NUM>       Repetitions
-  -t<NUM>       Number of threads of the server
-  -p<NUM>       Server port
-  -r<NUM>       Starting delay (secs)
+  -t<NUM>       Client threads number
+  -T<NUM>       Server threads number
-  -j<FLOAT>     Delay between tests (secs)
-

cherokee/trunk/qa/run-tests.py

@@ -29 +29 @@
-pause     = 0
-tpause    = 0.0
+srv_thds  = None
-ssl       = False
-clean     = True
@@ -88 +89 @@
-    elif p[:2] == '-p': port      = int(p[2:])
-    elif p[:2] == '-r': delay     = int(p[2:])
+    elif p[:2] == '-T': srv_thds  = int(p[2:])    
-    elif p[:2] == '-j': tpause    = float(p[2:])
-    elif p[:2] == '-d': pause     = p[2:]
@@ -191 +193 @@
-""" % (LOGGER_TYPE, LOGGER_ACCESS, LOGGER_ERROR)
-
+if srv_thds:
+    CONF_BASE += """
+server!thread_number = %d
+""" % (srv_thds)
-
-# Import modules