Changeset 1843

Timestamp:

Mar 4, 2008 3:31:13 PM (17 years ago)

Author:

bennylp

Message:

Ticket #501: Set master port worker thread priority to highest by default

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/clock.h (modified) (2 diffs)
• include/pjmedia/master_port.h (modified) (1 diff)
• src/pjmedia/clock_thread.c (modified) (1 diff)
• src/pjmedia/master_port.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/clock.h

@@ -63 +63 @@
      * #pjmedia_clock_wait() in order to synchronize timing.
      */
-    PJMEDIA_CLOCK_NO_ASYNC  = 1
+    PJMEDIA_CLOCK_NO_ASYNC  = 1,
+
+    /**
+     * Prevent the clock from setting it's thread to highest priority.
+     */
+    PJMEDIA_CLOCK_NO_HIGHEST_PRIO = 2
 };
 
@@ -87 +92 @@
  *                          along with clock_rate, specifies the interval
  *                          of each clock run (or clock ticks).
- * @param options           By default, the callback will be called 
- *                          asynchronously (depending on the clock 
- *                          implementation backend, a thread may be 
- *                          created). If PJMEDIA_CLOCK_NO_ASYNC is set,
- *                          application must poll the clock with 
- *                          #pjmedia_clock_wait() to let the clock runs.
+ * @param options           Bitmask of pjmedia_clock_options.
  * @param cb                Callback to be called for each clock tick.
  * @param user_data         User data, which will be passed to the callback.

pjproject/trunk/pjmedia/include/pjmedia/master_port.h

@@ -71 +71 @@
  * @param u_port        Upstream port.
  * @param d_port        Downstream port.
- * @param options       Options flags, must be zero for now.
+ * @param options       Options flags, from bitmask combinations from
+ *                      pjmedia_clock_options.
  * @param p_m           Pointer to receive the master port instance.
  *

pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

@@ -216 +216 @@
     pjmedia_clock *clock = (pjmedia_clock*) arg;
 
+    /* Set thread priority to maximum unless not wanted. */
+    if ((clock->options & PJMEDIA_CLOCK_NO_HIGHEST_PRIO) == 0) {
+        int max = pj_thread_get_prio_max(pj_thread_this());
+        if (max > 0)
+            pj_thread_set_prio(pj_thread_this(), max);
+    }
+
     /* Get the first tick */
     pj_get_timestamp(&clock->next_tick);

pjproject/trunk/pjmedia/src/pjmedia/master_port.c

@@ -103 +103 @@
 
     /* Create media clock */
-    status = pjmedia_clock_create(pool, clock_rate, samples_per_frame, 0,
-                                  &clock_callback, m, &m->clock);
+    status = pjmedia_clock_create(pool, clock_rate, samples_per_frame, 
+                                  options, &clock_callback, m, &m->clock);
     if (status != PJ_SUCCESS) {
         pj_lock_destroy(m->lock);