commit 89054056a755b275498fd2eb951dafccc1d6b886
author Elliott Hughes <enh@google.com> Wed Jun 13 14:21:23 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue May 14 19:49:30 2013 -0700
tree 7a21e27f0dd9514ac49d0fa57385e0bf3e2e6c0c
parent bfec3a315000e9fcfc8e2d3fcef25e747e3d2053

Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().

(If you fclose(3) rather than pclose(3) a FILE* you got from popen(3),
future popen(3)s fail obscurely, at least on Mac OS.)

(cherry picked from commit 2bf76e143da933184d1392fb9bea3a3896c37e76)

Change-Id: I5578fe06753061b0dbc5ee951ebf31eb2bab0389

libcorkscrew/map_info.c

diff --git a/libcorkscrew/map_info.c b/libcorkscrew/map_info.c
index 00e901e..93dffbf 100644
--- a/libcorkscrew/map_info.c
+++ b/libcorkscrew/map_info.c
@@ -83,7 +83,7 @@
             milist = mi;
         }
     }
-    fclose(fp);
+    pclose(fp);
     return milist;
 }
 
@@ -220,7 +220,7 @@
     pthread_mutex_lock(&g_my_map_info_list_mutex);
 
     int64_t time = now_ns();
-    if (g_my_map_info_list) {
+    if (g_my_map_info_list != NULL) {
         my_map_info_data_t* data = (my_map_info_data_t*)g_my_map_info_list->data;
         int64_t age = time - data->timestamp;
         if (age >= MAX_CACHE_AGE) {
@@ -232,10 +232,10 @@
         }
     }
 
-    if (!g_my_map_info_list) {
+    if (g_my_map_info_list == NULL) {
         my_map_info_data_t* data = (my_map_info_data_t*)malloc(sizeof(my_map_info_data_t));
         g_my_map_info_list = load_map_info_list(getpid());
-        if (g_my_map_info_list) {
+        if (g_my_map_info_list != NULL) {
             ALOGV("Loaded my_map_info_list %p.", g_my_map_info_list);
             g_my_map_info_list->data = data;
             data->refs = 1;
@@ -265,3 +265,15 @@
         pthread_mutex_unlock(&g_my_map_info_list_mutex);
     }
 }
+
+void flush_my_map_info_list() {
+    pthread_mutex_lock(&g_my_map_info_list_mutex);
+
+    if (g_my_map_info_list != NULL) {
+        my_map_info_data_t* data = (my_map_info_data_t*) g_my_map_info_list->data;
+        dec_ref(g_my_map_info_list, data);
+        g_my_map_info_list = NULL;
+    }
+
+    pthread_mutex_unlock(&g_my_map_info_list_mutex);
+}