Relying on faster coarse monotonic clock as time source, fixing a leak

on the HTTP POST module

Author: wberube

src/hal/tools.c

@@ -336,9 +336,12 @@ char *memstr(char *haystack, char *needle, int size, char needlesize) {
 }
 
 unsigned int millis() {
-    struct timeval t;
-    gettimeofday(&t, NULL);
-    return t.tv_sec * 1000 + (t.tv_usec + 500) / 1000;
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
+    uint32_t sec = (uint32_t)ts.tv_sec;
+    uint32_t sec_ms = (sec << 10) - (sec << 4) - (sec << 3);
+    uint32_t nsec_ms = ts.tv_nsec / 1000000;
+    return sec_ms + nsec_ms;
 }
 
 void reverse(void *arr, size_t width) {

src/http_post.c

@@ -9,7 +9,7 @@ int http_post_send(hal_jpegdata *jpeg) {
     if (sockfd == -1)
         HAL_ERROR("http_post", "Socket creation failed!\n");
 
-    struct addrinfo *server_addr;
+    struct addrinfo *server_addr = NULL;
     int ret = getaddrinfo(host_addr, "80", NULL, &server_addr);
     if (!ret) {
         const struct addrinfo *r;
@@ -62,7 +62,8 @@ int http_post_send(hal_jpegdata *jpeg) {
 
         close(sockfd);
     }
-    freeaddrinfo(server_addr);
+
+    if (server_addr) freeaddrinfo(server_addr);
 
     return EXIT_SUCCESS;
 }
@@ -94,6 +95,13 @@ void *http_post_thread(void) {
             continue;
         }
     }
+
+    if (jpeg.data) {
+        free(jpeg.data);
+        jpeg.data = NULL;
+    }
+
+    return NULL;
 }
 
 void start_http_post_send() {
@@ -114,4 +122,4 @@ void start_http_post_send() {
 
 void stop_http_post_send() {
     pthread_join(httpPostPid, NULL);
-}
+}

src/main.c

@@ -109,6 +109,9 @@ int main(int argc, char *argv[]) {
         HAL_INFO("rtsp", "Server has closed!\n");
     }
 
+    if (app_config.http_post_enable)
+        stop_http_post_send();
+
     if (app_config.osd_enable)
         stop_region_handler();
 

src/rtsp/common.h

@@ -48,10 +48,10 @@
     fprintf(stderr, "XXX ERROR:%s:%s:%d XXX: ",__FILE__,__FUNCTION__,__LINE__);\
     fprintf(stderr, fmt,  ## args);} while (0)
 
-#define CHECK 
+#define CHECK
 
 /* debug assert (completely removed in release version) */
-//#define DASSERT(b,action) 
+//#define DASSERT(b,action)
 
 /* must success (check omitted in release version) */
 //#define MUST(b,action) do {if ((b)){}} while (0)
@@ -75,19 +75,21 @@
 /* Defining infinite time */
 #define FOREVER         -1
 
-#define CLEAR(x) memset (&(x), 0, sizeof (x))
 #define CLOSE(x) do{if((x)>0){close(x);(x) = 0;}}while(0)
 #define FCLOSE(x) do{if((x)!=NULL){fclose(x);(x) = NULL;}}while(0)
 #define ALLOC(t) (t = (typeof(t))calloc(1,sizeof(typeof(*(t)))))
 #define NEW(t) ((t *)calloc(1,sizeof(t)))
 
+#ifndef CLEAR
+#define CLEAR(x) memset (&(x), 0, sizeof (x))
+#endif
 #define COPY(x,y) memcpy ((x),(y),sizeof (*(y)))
 //#define FREE(h) do { if(h){printf("freeing 0x%08x\n",(unsigned int)h);free(h);h=NULL;}else{DBG("freeing NULL pointer\n");}} while (0);
 #define FREE(h) do { if(h){free(h);h=NULL;}} while (0);
 
 /* common object creation macro: calloc given pointer. when failed, perform 'action' */
 #define TALLOC(h,action) do {h=NULL;if(!(ALLOC(h))){ERR("No memory!\n");action;}} while (0)
-    
+
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
 #endif
@@ -162,4 +164,4 @@ gbl_set_quit(struct global_state_t *gbl)
 	pthread_mutex_unlock(&gbl->mutex);
 }
 
-#endif				
+#endif