Parsing empty config strings, working on the RTSP library, and using

writev to serve HTTP with less context switching

Author: wberube

src/hal/config.h

@@ -12,7 +12,7 @@
 
 #define MAX_SECTIONS 16
 #define REG_SECTION "^([[:space:]]*\\[(\\w+)\\][[:space:]]|(\\w+):)"
-#define REG_PARAM "^[[:space:]]*%s[[:space:]]*[=:][[:space:]]*(.[^;#\n\r]*)"
+#define REG_PARAM "^[[:space:]]*%s[[:blank:]]*[=:][[:blank:]]*(.[^;#\n\r]*)"
 
 struct IniConfig {
     char *str;

src/rtsp/bufpool.h

@@ -45,7 +45,7 @@ static inline int bufpool_attach(bufpool_handle h, void *buf);
 static inline void bufpool_statistics(bufpool_handle h);
 
 /******************************************************************************
- *              INLINE FUNCTIONS 
+ *              INLINE FUNCTIONS
  ******************************************************************************/
  /* to use strict-aliase compiler optimization, we cannot use void **, so use macro : completely dependent of gcc-extension :p */
 #define bufpool_get_free(__h,__p_buf) ({ \
@@ -68,14 +68,14 @@ __unlock: \
 static inline int __bufpool_ref_manipulate(bufpool_handle h, void *buf, int val)
 {
     struct __bufpool_elem_t *p;
-    
+
     DASSERT(h->elems,return FAILURE);
     DASSERT(h->num > 0,return FAILURE);
 
     ASSERT(p = hash_lookup(h->buf_table,(hash_key_t) buf), return FAILURE);
 
     DASSERT(CHECK_MAGIC(MAGIC_BUFPOOL_ELEM,&p), return FAILURE);
-    
+
     p->ref_count += val;
 
     TEST(p->ref_count >= 0, ({
@@ -112,7 +112,7 @@ static inline void bufpool_statistics(bufpool_handle h)
     pthread_mutex_lock(&h->mutex);
 
     free_elems = list_length(&h->free_list);
-    free_elems_ratio = ((float)free_elems/(float)h->num) * max; 
+    free_elems_ratio = ((float)free_elems/(float)h->num) * max;
 
     for(i = 0; i < free_elems_ratio; i++) {
         tmp[j++] = '=';
@@ -135,9 +135,9 @@ static inline int bufpool_attach(bufpool_handle h, void *buf)
     DASSERT(h,return FAILURE);
 
     pthread_mutex_lock(&h->mutex);
-    
+
     ret = __bufpool_ref_manipulate(h,buf,1);
-    
+
     pthread_mutex_unlock(&h->mutex);
 
     return ret;
@@ -149,9 +149,9 @@ static inline int bufpool_detach(bufpool_handle h, void *buf)
     DASSERT(h,return FAILURE);
 
     pthread_mutex_lock(&h->mutex);
-    
+
     ret = __bufpool_ref_manipulate(h,buf,-1);
-    
+
     pthread_mutex_unlock(&h->mutex);
 
     return ret;
@@ -207,7 +207,7 @@ static inline bufpool_handle bufpool_create(int num, void * (*bufgetter_fxn)(int
         ASSERT(p == &nh->elems[i], goto error);
 #endif
     }
-    
+
 
     nh->num = num;
 
@@ -220,26 +220,25 @@ static inline bufpool_handle bufpool_create(int num, void * (*bufgetter_fxn)(int
 
 static void bufpool_delete(bufpool_handle h)
 {
-    int i;
-    if (h) {
-        if (h->elems) {
-            for(i = 0;i < h->num; i++) {
-                if(h->elems[i].reset) {
-                    h->elems[i].reset(h->elems[i].buf);
-                }
+    if (!h) return;
+
+    if (h->elems) {
+        for (int i = 0;i < h->num; i++) {
+            if(h->elems[i].reset) {
+                h->elems[i].reset(h->elems[i].buf);
             }
-            FREE(h->elems);
         }
+        FREE(h->elems);
+    }
 
-        hash_destroy(h->buf_table);
+    hash_destroy(h->buf_table);
 
-        pthread_mutex_destroy(&h->mutex);
-        FREE(h);
-    }
+    pthread_mutex_destroy(&h->mutex);
+    FREE(h);
 }
 
 
 #if defined (__cplusplus)
 }
 #endif
-#endif
+#endif

src/rtsp/hash.h

@@ -61,17 +61,16 @@ static inline struct __hash_entry *__new_hash_entry(hash_key_t key, void *value)
 
 static inline void hash_destroy(hash_handle h)
 {
-    int i;
-    if(h){
-        if(h->pool){
-            for(i = 0;i < h->size;i++) {
-                list_destroy(&(h->pool[i]));
-            }
-            FREE(h->pool);
-        }
+    if(!h) return;
 
-        FREE(h);
+    if(h->pool){
+        for(int i = 0;i < h->size;i++) {
+            list_destroy(&(h->pool[i]));
+        }
+        FREE(h->pool);
     }
+
+    FREE(h);
 }
 
 static inline hash_handle hash_create(int size, size_t buf_size)
@@ -101,7 +100,7 @@ static inline int __lookup_key(struct list_t *e, void *v)
     return (p->key == key);
 }
 
-static inline struct __hash_entry *__find_entry(hash_handle h, int pos, hash_key_t key)   
+static inline struct __hash_entry *__find_entry(hash_handle h, int pos, hash_key_t key)
 {
     struct __hash_entry *p;
     struct list_t *e;
@@ -128,15 +127,15 @@ static inline void *hash_lookup(hash_handle h, hash_key_t key)
     struct __hash_entry *p;
     return (p = __find_entry(h,pos,key))? p->value : NULL;
 }
-    
+
 static inline int hash_add(hash_handle h, hash_key_t key, void *val)
 {
     struct __hash_entry *p;
     int pos =  __hash_buf(h->size,key,h->buf_size);
 
-    ASSERT(p = __new_hash_entry(key,val), 
+    ASSERT(p = __new_hash_entry(key,val),
         return FAILURE);
-    
+
     list_add(&(h->pool[pos]), &p->list_entry);
 
     h->num_items += 1;
@@ -168,4 +167,4 @@ static inline hash_key_t __hash_buf(int size, hash_key_t key, size_t buf_size)
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif

src/rtsp/rtsp.c

@@ -913,11 +913,15 @@ void rtsp_configure_auth(rtsp_handle h, const char *user, const char *pass)
 int rtsp_tick(rtsp_handle h)
 {
     ASSERT(h, return FAILURE);
+    struct timespec ts;
     struct timeval tv;
 
-    ASSERT(gettimeofday(&tv, NULL) == 0, ({
-        ERR("gettimeofday failed\n");
+    ASSERT(clock_gettime(CLOCK_MONOTONIC_COARSE, &ts) == 0, ({
+        ERR("clock_gettime failed\n");
         return FAILURE;}));
 
+    tv.tv_sec = ts.tv_sec;
+    tv.tv_usec = ts.tv_nsec / 1000;
+
     return __get_timestamp_offset(&h->stat, &tv);
 }

src/rtsp/thread.h

@@ -90,26 +90,26 @@ static inline void rendezvous_meet(rendezvous_handle hRv)
     DASSERT(hRv,return);
 
 
-    
+
     pthread_mutex_lock(&hRv->mutex);
-    
+
     if (!hRv->force) {
-    
+
         if (hRv->count > 0) {
             hRv->count--;
         }
-    
+
         if (hRv->count > 0 ) {
             pthread_cond_wait(&hRv->cond, &hRv->mutex);
-        } 
+        }
         else {
             pthread_cond_broadcast(&hRv->cond);
             hRv->count = hRv->orig;
         }
-    
+
     }
     pthread_mutex_unlock(&hRv->mutex);
-    
+
 }
 
 /******************************************************************************
@@ -289,7 +289,7 @@ fifo_flush(fifo_handle hfifo)
 	pthread_mutex_unlock(&hfifo->mutex);
 
 	/*
-	 * Make sure any fifo_get() calls are unblocked 
+	 * Make sure any fifo_get() calls are unblocked
 	 */
 	if (write(hfifo->pipes[1], &ch, 1) != 1) {
 		return FAILURE;
@@ -363,7 +363,7 @@ typedef struct thread_job {
 } thread_job;
 
 typedef thread_job *thread_handle;
-    
+
 typedef struct threadpool {
     thread_job *threads[MAX_NUMTHREAD];
     shared_interface *sharedp;
@@ -426,28 +426,27 @@ static inline int _fifo_connect(fifo_handle *lhs, fifo_handle *rhs);
 
 static inline void threadpool_delete(threadpool_handle h)
 {
-    int i;
-    if(h){
-        if(h->sharedp){
-            if(h->sharedp->rv_init){
-                rendezvous_delete(h->sharedp->rv_init);
-            }
-            if(h->sharedp->rv_cleanup){
-                rendezvous_delete(h->sharedp->rv_cleanup);
-            }
-
-            gbl_delete(h->sharedp->gbl);
+    if(!h) return;
 
-            FREE(h->sharedp);
+    if(h->sharedp){
+        if(h->sharedp->rv_init){
+            rendezvous_delete(h->sharedp->rv_init);
         }
-        
-        for(i=0;i<h->cnt;i++){
-            thread_delete(h->threads[i]);
+        if(h->sharedp->rv_cleanup){
+            rendezvous_delete(h->sharedp->rv_cleanup);
         }
 
+        gbl_delete(h->sharedp->gbl);
 
-        FREE(h);
+        FREE(h->sharedp);
     }
+
+    for(int i=0;i<h->cnt;i++){
+        thread_delete(h->threads[i]);
+    }
+
+
+    FREE(h);
 }
 
 static inline threadpool_handle threadpool_create(void *argsp)
@@ -486,7 +485,7 @@ static inline int threadpool_add(threadpool_handle h,thread_handle threadp)
 
     for(i=0;i<h->cnt;i++){
         DASSERT(h->threads[i] != threadp,return FAILURE);
-                
+
     }
 
     memcpy(tmp,threadp->name,MAX_THREADNAME);
@@ -553,7 +552,7 @@ static inline thread_handle create_base_thread(threadpool_handle h_pool, const c
     nh->param_priv = params;
 
     strncpy(nh->name, name,MAX_THREADNAME);
-    
+
     ASSERT(threadpool_add(h_pool,nh) == SUCCESS ,goto error);
 
     return nh;
@@ -647,27 +646,27 @@ static inline void thread_sync_cleanup(thread_handle h)
     if(h->hOutPut != NULL) fifo_flush(h->hOutPut);
     if(h->hInPut != NULL) fifo_flush(h->hInPut);
 
-    
+
     /* Make sure the other threads aren't waiting for us */
     rendezvous_force(sharedp->rv_init);
-    
+
     /* Meet up with other threads before cleaning up */
     rendezvous_meet(sharedp->rv_cleanup);
-    
+
     DBG("%s thread died\n",h->name);
 }
 
 static inline void thread_delete(thread_handle h)
 {
-    if(h){
-        if(h->started){
-            ERR("BUG: deleting uninitialized thread %s\n",h->name);
-        }
+    if(!h) return;
 
-        FREE(h->param_priv);
-
-        FREE(h);
+    if(h->started){
+        ERR("BUG: deleting uninitialized thread %s\n",h->name);
     }
+
+    FREE(h->param_priv);
+
+    FREE(h);
 }
 
 static inline int _fifo_connect(fifo_handle *lhs, fifo_handle *rhs)
@@ -689,7 +688,7 @@ static inline int _fifo_connect(fifo_handle *lhs, fifo_handle *rhs)
 }
 
 
-static inline int thread_joint(thread_handle lhs, thread_handle rhs) 
+static inline int thread_joint(thread_handle lhs, thread_handle rhs)
 {
     ASSERT(lhs,return FAILURE);
     ASSERT(rhs,return FAILURE);
@@ -700,7 +699,7 @@ static inline int thread_joint(thread_handle lhs, thread_handle rhs)
     return SUCCESS;
 }
 
-static inline int thread_chain(thread_handle lhs, thread_handle rhs) 
+static inline int thread_chain(thread_handle lhs, thread_handle rhs)
 {
     ASSERT(lhs,return FAILURE);
     ASSERT(rhs,return FAILURE);
@@ -710,7 +709,7 @@ static inline int thread_chain(thread_handle lhs, thread_handle rhs)
     return SUCCESS;
 }
 
-static inline int thread_extend(thread_handle lhs, thread_handle rhs) 
+static inline int thread_extend(thread_handle lhs, thread_handle rhs)
 {
     ASSERT(lhs,return FAILURE);
     ASSERT(rhs,return FAILURE);
@@ -720,7 +719,7 @@ static inline int thread_extend(thread_handle lhs, thread_handle rhs)
     return SUCCESS;
 }
 
-static inline int thread_close(thread_handle lhs, thread_handle rhs) 
+static inline int thread_close(thread_handle lhs, thread_handle rhs)
 {
     ASSERT(lhs,return FAILURE);
     ASSERT(rhs,return FAILURE);
@@ -743,4 +742,4 @@ static inline int thread_close(thread_handle lhs, thread_handle rhs)
 #define getpwnam __NEVER_EVER_USE_THREAD_UNSAFE_FUNCTION_IN_MULTI_THREADED_PROGRAM_YOU_SUCKER__
 
 
-#endif /* _IPC_H */
+#endif /* _IPC_H */