Changeset 253:a9913cdc2427 for uwsgi.c

Timestamp:

03/08/10 11:05:02 (5 months ago)

Author:

roberto@…

Branch:

default

Message:

a bit of vacuum

Files:

• uwsgi.c (modified) (22 diffs)

uwsgi.c

@@ -131 +131 @@
 
         PyThreadState *_myself;
-#ifndef ROCK_SOLID
+
+/* CHECK ROCK_SOLID 
         struct uwsgi_app *wi = NULL;
         if (wsgi_req.app_id >= 0) {
                 wi = &uwsgi.wsgi_apps[wsgi_req.app_id];
         }
-#endif
+ end rock_solid */
+
         PyGILState_Ensure ();
         _myself = PyThreadState_Get ();
         if (wi) {
+/*
 #ifdef ROCK_SOLID
                 fprintf (stderr, "\nF*CK !!! i must kill myself (pid: %d) wi: %p wi->wsgi_harakiri: %p thread_state: %p frame: %p...\n", uwsgi.mypid, wi, wi->wsgi_harakiri, _myself, _myself->frame);
 #else
+*/
                 fprintf (stderr, "\nF*CK !!! i must kill myself (pid: %d app_id: %d) wi: %p wi->wsgi_harakiri: %p thread_state: %p frame: %p...\n", uwsgi.mypid, wsgi_req.app_id, wi, wi->wsgi_harakiri, _myself, _myself->frame);
-#endif
 
                 if (wi->wsgi_harakiri) {
@@ -197 +200 @@
                 content = PyString_AsString (data);
                 len = PyString_Size (data);
-#ifndef ROCK_SOLID
+
+#ifdef UWSGI_THREADING
                 if (uwsgi.has_threads && uwsgi.shared->options[UWSGI_OPTION_THREADS] == 1) {
                         Py_BEGIN_ALLOW_THREADS wsgi_req.response_size = write (uwsgi.poll.fd, content, len);
@@ -213 +217 @@
                         }
 #endif
-#ifndef ROCK_SOLID
+#ifdef UWSGI_THREADING
                 }
 #endif
@@ -235 +239 @@
         PyObject *h_key, *h_value;
         int i, j;
+
 #ifndef UNBIT
-#ifdef ROCK_SOLID
-        int base = 4;
-#else
         int base = 0;
-#endif
 #else
         int base = 4;
@@ -465 +466 @@
         struct timeval check_interval = {.tv_sec = 1,.tv_usec = 0 };
 
-#ifndef PYTHREE
-#ifndef ROCK_SOLID
+#ifdef UWSGI_EMBEDDED
         PyObject *uwsgi_module;
 
-#endif
 #endif
         char *pyargv[MAX_PYARGV];
@@ -655 +654 @@
         }
 
+        uwsgi.binary_path = argv[0] ;
+
 #ifndef UNBIT
         while ((i = getopt_long (argc, argv, "s:p:t:x:d:l:O:v:b:mcaCTPiMhrR:z:w:j:H:A:Q:L", long_options, &option_index)) != -1) {
@@ -670 +671 @@
 #endif
 
-        if (uwsgi.binary_path == NULL) {
+        if (uwsgi.binary_path == argv[0]) {
                 cwd = uwsgi_get_cwd ();
                 uwsgi.binary_path = malloc (strlen (argv[0]) + 1);
@@ -681 +682 @@
 
 #ifndef UNBIT
-#ifndef ROCK_SOLID
         if (uwsgi.shared->options[UWSGI_OPTION_CGI_MODE] == 0) {
-#endif
 #endif
                 if (uwsgi.test_module == NULL) {
@@ -849 +848 @@
         wsgi_writeout = PyCFunction_New (uwsgi_write_method, NULL);
 
-#ifndef PYTHREE
-#ifndef ROCK_SOLID
+#ifdef UWSGI_EMBEDDED
         uwsgi_module = Py_InitModule ("uwsgi", null_methods);
         if (uwsgi_module == NULL) {
@@ -898 +896 @@
 
         init_uwsgi_embedded_module ();
-#endif
 #endif
 
@@ -1199 +1196 @@
 
 #ifndef UNBIT
-#ifndef ROCK_SOLID
         if (no_server) {
                 fprintf (stderr, "no-server mode requested. Goodbye.\n");
                 exit (0);
         }
-#endif
 #endif
 
@@ -1679 +1674 @@
                 else {
 #endif
+                        fprintf(stderr,"POLL ADDR: %p\n", &uwsgi.poll);
                         if (!uwsgi_parse_response (&uwsgi.poll, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT], (struct uwsgi_header *) &wsgi_req, uwsgi.buffer)) {
                                 continue;
@@ -1792 +1788 @@
 }
 
-#ifndef ROCK_SOLID
 int init_uwsgi_app (PyObject * force_wsgi_dict, PyObject * my_callable) {
         PyObject *wsgi_module, *wsgi_dict = NULL;
@@ -2311 +2306 @@
 }
 
-#endif
 
 #ifdef UNBIT
@@ -2512 +2506 @@
 
                 switch (i) {
-#ifndef ROCK_SOLID
 #ifndef UNBIT
                 case LONG_ARGS_PIDFILE:
@@ -2566 +2559 @@
                         uwsgi.rl.rlim_max = uwsgi.rl.rlim_cur;
                         break;
-#endif
                 case LONG_ARGS_PASTE:
                         uwsgi.single_interpreter = 1;
@@ -2651 +2643 @@
                         uwsgi.shared->options[UWSGI_OPTION_REAPER] = 1;
                         break;
-#ifndef ROCK_SOLID
                 case 'w':
                         uwsgi.single_interpreter = 1;
@@ -2662 +2653 @@
                         uwsgi.py_optimize = atoi (optarg);
                         break;
-#endif
                 case 't':
                         uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] = atoi (optarg);
@@ -2670 +2660 @@
                         break;
 #ifndef UNBIT
-#ifndef ROCK_SOLID
                 case 'c':
                         uwsgi.shared->options[UWSGI_OPTION_CGI_MODE] = 1;
                         break;
-#endif
                 case 'a':
                         uwsgi.abstract_socket = 1;
@@ -2693 +2681 @@
                         }
                         break;
-#ifndef ROCK_SOLID
                 case 'T':
                         uwsgi.has_threads = 1;
@@ -2704 +2691 @@
                         uwsgi.single_interpreter = 1;
                         break;
-#endif
 #ifndef UNBIT
                 case 'h':
@@ -2747 +2733 @@
 \t--limit-as <MB>\t\t\tlimit the address space of processes to MB megabytes\n\
 \t--udp <ip:port>\t\t\tbind master process to udp socket on ip:port\n\
+\t--erlang <name@ip>\t\tenable the Erlang server with node name <node@ip>\n\
+\t--erlang-cookie <cookie>\ttset the erlang cookie to <cookie>\n\
+\t--nagios\t\t\tdo a nagios check\n\
+\t--binary-path <bin-path>\ttset the path for the next reload of uWSGI (needed for chroot environments)\n\
+\t--proxy <socket>\t\trun the uwsgi proxy on socket <socket>\n\
+\t--proxy-node <socket>\t\tadd the node <socket> to the proxy\n\
+\t--proxy-max-connections <n>\tset the max number of concurrent connections mnaged by the proxy\n\
+\t--wsgi-file <file>\t\tload the <file> wsgi file\n\
 \t-d|--daemonize <logfile>\tdaemonize and log into <logfile>\n", uwsgi.binary_path);
                         exit (1);