Changeset 3950 for pjproject/trunk

Timestamp:

Feb 6, 2012 8:27:28 AM (13 years ago)

Author:

ming

Message:

Closed #1450: Add support for SDL job queue to grow in size.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -99 +99 @@
 };
 
-#define MAX_JOBS 8
+#define INITIAL_MAX_JOBS 64
+#define JOB_QUEUE_INC_FACTOR 2
 
 typedef pj_status_t (*job_func_ptr)(void *data);
@@ -129 +130 @@
 
 typedef struct job_queue {
-    job            *jobs[MAX_JOBS];
-    pj_sem_t       *job_sem[MAX_JOBS];
+    pj_pool_t      *pool;
+    job           **jobs;
+    pj_sem_t      **job_sem;
+    pj_sem_t      **old_sem;
     pj_mutex_t     *mutex;
     pj_thread_t    *thread;
     pj_sem_t       *sem;
 
-    int             head, tail;
+    unsigned        size;
+    unsigned        head, tail;
     pj_bool_t       is_full;
     pj_bool_t       is_quitting;
@@ -1234 +1238 @@
         jb = jq->jobs[jq->head];
         jb->retval = (*jb->func)(jb->data);
-        pj_sem_post(jq->job_sem[jq->head]);
-        pj_mutex_lock(jq->mutex);
-        jq->head = (jq->head + 1) % MAX_JOBS;
-        jq->is_full = PJ_FALSE;
-        pj_mutex_unlock(jq->mutex);
+        /* If job queue is full and we already finish all the pending
+         * jobs, increase the size.
+         */
+        if (jq->is_full && ((jq->head + 1) % jq->size == jq->tail)) {
+            unsigned i, head;
+
+            if (jq->old_sem) {
+                for (i = 0; i < jq->size / JOB_QUEUE_INC_FACTOR; i++) {
+                    pj_sem_destroy(jq->old_sem[i]);
+                }
+            }
+            jq->old_sem = jq->job_sem;
+
+            /* Double the job queue size. */
+            jq->size *= JOB_QUEUE_INC_FACTOR;
+            pj_sem_destroy(jq->sem);
+            pj_sem_create(jq->pool, "thread_sem", 0, jq->size + 1,
+                          &jq->sem);
+            jq->jobs = (job **)pj_pool_calloc(jq->pool, jq->size,
+                                              sizeof(job *));
+            jq->job_sem = (pj_sem_t **) pj_pool_calloc(jq->pool, jq->size,
+                                                       sizeof(pj_sem_t *));
+            for (i = 0; i < jq->size; i++) {
+                pj_sem_create(jq->pool, "job_sem", 0, 1, &jq->job_sem[i]);
+            }
+            jq->is_full = PJ_FALSE;
+            head = jq->head;
+            jq->head = jq->tail = 0;
+            pj_sem_post(jq->old_sem[head]);
+        } else {
+            pj_sem_post(jq->job_sem[jq->head]);
+            jq->head = (jq->head + 1) % jq->size;
+        }
     }
 
@@ -1250 +1282 @@
 
     job_queue *jq = PJ_POOL_ZALLOC_T(pool, job_queue);
-    pj_sem_create(pool, "thread_sem", 0, MAX_JOBS + 1, &jq->sem);
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
@@ -1263 +1294 @@
 #endif /* PJ_DARWINOS */
 
-    for (i = 0; i < MAX_JOBS; i++) {
+    jq->pool = pool;
+    jq->size = INITIAL_MAX_JOBS;
+    pj_sem_create(pool, "thread_sem", 0, jq->size + 1, &jq->sem);
+    jq->jobs = (job **)pj_pool_calloc(pool, jq->size, sizeof(job *));
+    jq->job_sem = (pj_sem_t **) pj_pool_calloc(pool, jq->size,
+                                               sizeof(pj_sem_t *));
+    for (i = 0; i < jq->size; i++) {
         pj_sem_create(pool, "job_sem", 0, 1, &jq->job_sem[i]);
     }
@@ -1297 +1334 @@
 #else /* PJ_DARWINOS */
     pj_mutex_lock(jq->mutex);
-    if (jq->is_full) {
-        /* Sorry, the queue is full! */
-        pj_mutex_unlock(jq->mutex);
-        *retval = PJ_ETOOMANY;
-        return PJ_ETOOMANY;
-    }
     jq->jobs[jq->tail] = &jb;
     tail = jq->tail;
-    jq->tail = (jq->tail + 1) % MAX_JOBS;
-    if (jq->tail == jq->head)
+    jq->tail = (jq->tail + 1) % jq->size;
+    if (jq->tail == jq->head) {
         jq->is_full = PJ_TRUE;
-    pj_mutex_unlock(jq->mutex);
-
-    pj_sem_post(jq->sem);
-    /* Wait until our posted job is completed. */
-    pj_sem_wait(jq->job_sem[tail]);
+        PJ_LOG(4, (THIS_FILE, "SDL job queue is full, increasing "
+                              "the queue size."));
+        pj_sem_post(jq->sem);
+        /* Wait until our posted job is completed. */
+        pj_sem_wait(jq->job_sem[tail]);
+        pj_mutex_unlock(jq->mutex);
+    } else {
+        pj_mutex_unlock(jq->mutex);
+        pj_sem_post(jq->sem);
+        /* Wait until our posted job is completed. */
+        pj_sem_wait(jq->job_sem[tail]);
+    }
 #endif /* PJ_DARWINOS */
 
@@ -1335 +1373 @@
         jq->sem = NULL;
     }
-    for (i = 0; i < MAX_JOBS; i++) {
+    for (i = 0; i < jq->size; i++) {
         pj_sem_destroy(jq->job_sem[i]);
+    }
+    if (jq->old_sem) {
+        for (i = 0; i < jq->size / JOB_QUEUE_INC_FACTOR; i++) {
+            pj_sem_destroy(jq->old_sem[i]);
+        }
     }
     pj_mutex_destroy(jq->mutex);