Changeset 767:c47c16436f71 in freeDiameter for extensions

Timestamp:

Oct 24, 2011, 6:43:32 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added a limit on fifo queues to avoid memory exaustion when messages are received faster than handled

Location:

extensions

Files:

• app_radgw/rgw_worker.c (modified) (1 diff)
• dbg_interactive/queues.i (modified) (3 diffs)

extensions/app_radgw/rgw_worker.c

@@ -327 +327 @@
         memset(workers, 0, sizeof(workers));
         
-        CHECK_FCT( fd_fifo_new ( &work_stack ) );
+        CHECK_FCT( fd_fifo_new ( &work_stack, 30 ) );
         
         /* Create the worker thread(s) */

extensions/dbg_interactive/queues.i

@@ -42 +42 @@
 
 %extend fifo {
-        fifo() {
+        fifo(int max = 0) {
                 struct fifo * q = NULL;
-                int ret = fd_fifo_new(&q);
+                int ret = fd_fifo_new(&q, max);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -147 +147 @@
                 ret = fd_fifo_tryget($self, &obj);
                 if (ret == EWOULDBLOCK) {
-                        Py_XINCREF(Py_None);
+                        Py_INCREF(Py_None);
                         return Py_None;
                 }
@@ -182 +182 @@
                 ret = fd_fifo_timedget($self, &obj, &ts);
                 if (ret == ETIMEDOUT) {
-                        Py_XINCREF(Py_None);
+                        Py_INCREF(Py_None);
                         return Py_None;
                 }