Changeset 245:677fbe9318d8 for uwsgi.c

Timestamp:

03/01/10 18:51:11 (5 months ago)

Author:

roberto@…

Branch:

default

Message:

complete erlang integration. Now working on timeout and memory management

Files:

• uwsgi.c (modified) (10 diffs)

uwsgi.c

@@ -451 +451 @@
 char *spool_dir = NULL;
 
-static int unconfigured_hook(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req, char *buffer) {
+static int unconfigured_hook(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
         fprintf(stderr, "-- unavailable modifier requested: %d --\n", wsgi_req->modifier);
         return -1;
 }
 
-static void unconfigured_after_hook(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req, char *buffer) {
+static void unconfigured_after_hook(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
         return;
 }
@@ -509 +509 @@
         char env_reload_buf[11];
 
-        char *buffer;
 
 #ifdef UNBIT
@@ -1065 +1064 @@
                 exit (1);
         }
-        buffer = malloc (uwsgi.buffer_size);
-        if (buffer == NULL) {
+        uwsgi.buffer = malloc (uwsgi.buffer_size);
+        if (uwsgi.buffer == NULL) {
                 fprintf (stderr, "unable to allocate memory for buffer.\n");
                 exit (1);
@@ -1322 +1321 @@
                                         else if (rlen > 0) {
                                                 udp_len = sizeof (udp_client);
-                                                rlen = recvfrom (udp_poll.fd, buffer, uwsgi.buffer_size, 0, (struct sockaddr *) &udp_client, &udp_len);
+                                                rlen = recvfrom (udp_poll.fd, uwsgi.buffer, uwsgi.buffer_size, 0, (struct sockaddr *) &udp_client, &udp_len);
                                                 if (rlen < 0) {
                                                         perror ("recvfrom()");
@@ -1330 +1329 @@
                                                         if (inet_ntop (AF_INET, &udp_client.sin_addr.s_addr, udp_client_addr, 16)) {
                                                                 fprintf (stderr, "received udp packet of %d bytes from %s:%d\n", rlen, udp_client_addr, ntohs (udp_client.sin_port));
-                                                                if (buffer[0] == 0x30) {
-                                                                        manage_snmp (udp_poll.fd, (uint8_t *) buffer, rlen, &udp_client);
+                                                                if (uwsgi.buffer[0] == 0x30) {
+                                                                        manage_snmp (udp_poll.fd, (uint8_t *) uwsgi.buffer, rlen, &udp_client);
                                                                 }
                                                         }
@@ -1474 +1473 @@
                 else if ( uwsgi.mywid > (uwsgi.numproc - uwsgi.erlang_nodes) ) {
                         fprintf(stderr,"Erlang mode enabled for worker %d.\n", uwsgi.mywid);
-                        erlang_loop(buffer);
+                        erlang_loop();
                         // NEVER HERE
                         exit(1);
@@ -1532 +1531 @@
 
                         i = 0;
-                        wsgi_req.size = sctp_recvmsg (uwsgi.poll.fd, buffer, uwsgi.buffer_size, 0, 0, &sctp_ss, 0);
+                        wsgi_req.size = sctp_recvmsg (uwsgi.poll.fd, uwsgi.buffer, uwsgi.buffer_size, 0, 0, &sctp_ss, 0);
                         if (wsgi_req.size < 0) {
                                 perror ("sctp_recvmsg()");
@@ -1541 +1540 @@
                 else {
 #endif
-                        if (!uwsgi_parse_response (&uwsgi.poll, uwsgi.options[UWSGI_OPTION_SOCKET_TIMEOUT], (struct uwsgi_header *) &wsgi_req, buffer)) {
+                        if (!uwsgi_parse_response (&uwsgi.poll, uwsgi.options[UWSGI_OPTION_SOCKET_TIMEOUT], (struct uwsgi_header *) &wsgi_req, uwsgi.buffer)) {
                                 continue;
                         }
@@ -1553 +1552 @@
                 }
 
-                ret = (*uwsgi.hooks[wsgi_req.modifier])(&uwsgi, &wsgi_req, buffer);
+                ret = (*uwsgi.hooks[wsgi_req.modifier])(&uwsgi, &wsgi_req);
                 // calculate execution time
                 gettimeofday(&wsgi_req.end_of_request, NULL) ;
@@ -1569 +1568 @@
 
                 if (!ret)
-                        (*uwsgi.after_hooks[wsgi_req.modifier])(&uwsgi, &wsgi_req, buffer);
+                        (*uwsgi.after_hooks[wsgi_req.modifier])(&uwsgi, &wsgi_req);