Changeset 3997

Timestamp:

Mar 30, 2012 6:46:19 AM (12 years ago)

Author:

ming

Message:

Re #1446 (misc fix): Add more robust checking and logs for SDL job queue creation/destruction.

File:

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

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

@@ -534 +534 @@
 #endif
         pj_thread_join(sf->sdl_thread);
+        pj_thread_destroy(sf->sdl_thread);
     }
 
@@ -1243 +1244 @@
         if (jq->is_full && ((jq->head + 1) % jq->size == jq->tail)) {
             unsigned i, head;
+            pj_status_t status;
 
             if (jq->old_sem) {
@@ -1254 +1256 @@
             jq->size *= JOB_QUEUE_INC_FACTOR;
             pj_sem_destroy(jq->sem);
-            pj_sem_create(jq->pool, "thread_sem", 0, jq->size + 1,
-                          &jq->sem);
+            status = pj_sem_create(jq->pool, "thread_sem", 0, jq->size + 1,
+                                   &jq->sem);
+            if (status != PJ_SUCCESS) {
+                PJ_LOG(3, (THIS_FILE, "Failed growing SDL job queue size."));
+                return 0;
+            }
             jq->jobs = (job **)pj_pool_calloc(jq->pool, jq->size,
                                               sizeof(job *));
@@ -1261 +1267 @@
                                                        sizeof(pj_sem_t *));
             for (i = 0; i < jq->size; i++) {
-                pj_sem_create(jq->pool, "job_sem", 0, 1, &jq->job_sem[i]);
+                status = pj_sem_create(jq->pool, "job_sem", 0, 1,
+                                       &jq->job_sem[i]);
+                if (status != PJ_SUCCESS) {
+                    PJ_LOG(3, (THIS_FILE, "Failed growing SDL job "
+                                          "queue size."));
+                    return 0;
+                }
             }
             jq->is_full = PJ_FALSE;
@@ -1282 +1294 @@
 
     job_queue *jq = PJ_POOL_ZALLOC_T(pool, job_queue);
+    jq->pool = pool;
+    jq->size = INITIAL_MAX_JOBS;
+    status = pj_sem_create(pool, "thread_sem", 0, jq->size + 1, &jq->sem);
+    if (status != PJ_SUCCESS)
+        goto on_error;
+    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++) {
+        status = pj_sem_create(pool, "job_sem", 0, 1, &jq->job_sem[i]);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+    }
+
+    status = pj_mutex_create_recursive(pool, "job_mutex", &jq->mutex);
+    if (status != PJ_SUCCESS)
+        goto on_error;
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
@@ -1288 +1317 @@
     status = pj_thread_create(pool, "job_th", job_thread, jq, 0, 0,
                               &jq->thread);
-    if (status != PJ_SUCCESS) {
-        job_queue_destroy(jq);
-        return status;
-    }
+    if (status != PJ_SUCCESS)
+        goto on_error;
 #endif /* PJ_DARWINOS */
 
-    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]);
-    }
-    pj_mutex_create_recursive(pool, "job_mutex", &jq->mutex);
-
     *pjq = jq;
     return PJ_SUCCESS;
+
+on_error:
+    job_queue_destroy(jq);
+    return status;
 }
 
@@ -1367 +1387 @@
         pj_sem_post(jq->sem);
         pj_thread_join(jq->thread);
+        pj_thread_destroy(jq->thread);
     }
 
@@ -1374 +1395 @@
     }
     for (i = 0; i < jq->size; i++) {
-        pj_sem_destroy(jq->job_sem[i]);
+        if (jq->job_sem[i]) {
+            pj_sem_destroy(jq->job_sem[i]);
+            jq->job_sem[i] = NULL;
+        }
     }
     if (jq->old_sem) {
         for (i = 0; i < jq->size / JOB_QUEUE_INC_FACTOR; i++) {
-            pj_sem_destroy(jq->old_sem[i]);
+            if (jq->old_sem[i]) {
+                pj_sem_destroy(jq->old_sem[i]);
+                jq->old_sem[i] = NULL;
+            }
         }
     }
-    pj_mutex_destroy(jq->mutex);
+    if (jq->mutex) {
+        pj_mutex_destroy(jq->mutex);
+        jq->mutex = NULL;
+    }
 
     return PJ_SUCCESS;