lock/unlock outside of the helper function

Change-Id: I58ffefedb39143391a62a3f9526dea09256f647b

diff --git a/src/tdm_helper.c b/src/tdm_helper.c
index 712a9da..cf05aa0 100644 (file)
--- a/src/tdm_helper.c
+++ b/src/tdm_helper.c
@@ -789,7 +789,6 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
        private_display = dpy;
        func_output = &private_display->func_output;
        func_layer = &private_display->func_layer;
-       _pthread_mutex_lock(&private_display->lock);
 
        /* module information */
        module_data = private_display->module_data;
@@ -825,9 +824,9 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                if (private_output->caps.mode_count > 0) {
                        const tdm_output_mode *current_mode = NULL;
 
-                       TDM_DBG_GOTO_IF_FAIL(func_output->output_get_mode, unlock);
+                       TDM_DBG_RETURN_IF_FAIL(func_output->output_get_mode);
                        ret = func_output->output_get_mode(private_output->output_backend, &current_mode);
-                       TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
+                       TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 
                        TDM_SNPRINTF(reply, len, "\t\t name refresh (Hz) clk hdisp hss hse htot vdisp vss vse vtot vscan\n");
                        for (i = 0; i < private_output->caps.mode_count; i++) {
@@ -858,11 +857,11 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                        TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
                        for (i = 0; i < private_output->caps.prop_count; i++) {
                                tdm_value value;
-                               TDM_DBG_GOTO_IF_FAIL(func_output->output_get_property, unlock);
+                               TDM_DBG_RETURN_IF_FAIL(func_output->output_get_property);
                                ret = func_output->output_get_property(private_output->output_backend,
                                                                                                           private_output->caps.props[i].id,
                                                                                                           &value);
-                               TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
+                               TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
                                TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
                                                         private_output->caps.props[i].name,
                                                         tdm_value_type_str(private_output->caps.props[i].type),
@@ -903,10 +902,10 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                                tdm_size size;
                                tbm_surface_info_s buf_info;
 
-                               TDM_DBG_GOTO_IF_FAIL(func_layer->layer_get_info, unlock);
+                               TDM_DBG_RETURN_IF_FAIL(func_layer->layer_get_info);
                                memset(&info, 0, sizeof info);
                                ret = func_layer->layer_get_info(private_layer->layer_backend, &info);
-                               TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
+                               TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 
                                if (!private_layer->showing_buffer)
                                        continue;
@@ -959,11 +958,11 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                                TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
                                for (i = 0; i < private_layer->caps.prop_count; i++) {
                                        tdm_value value;
-                                       TDM_DBG_GOTO_IF_FAIL(func_layer->layer_get_property, unlock);
+                                       TDM_DBG_RETURN_IF_FAIL(func_layer->layer_get_property);
                                        ret = func_layer->layer_get_property(private_layer->layer_backend,
                                                                                                                 private_layer->caps.props[i].id,
                                                                                                                 &value);
-                                       TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
+                                       TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
                                        TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
                                                                 private_layer->caps.props[i].name,
                                                                 tdm_value_type_str(private_output->caps.props[i].type),
@@ -1074,9 +1073,6 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                TDM_SNPRINTF(reply, len, "[No Capture capability]\n");
        }
        TDM_SNPRINTF(reply, len, "\n");
-
-unlock:
-       _pthread_mutex_unlock(&private_display->lock);
 }
 
 EXTERN int

diff --git a/src/tdm_monitor_server.c b/src/tdm_monitor_server.c
index c46d457..e7844a5 100644 (file)
--- a/src/tdm_monitor_server.c
+++ b/src/tdm_monitor_server.c
@@ -50,7 +50,9 @@ static void _tdm_monitor_server_usage(char *app_name, char *reply, int *len);
 static void
 _tdm_monitor_server_query(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
+       tdm_display_lock(dpy);
        tdm_helper_get_display_information(dpy, reply, len);
+       tdm_display_unlock(dpy);
 }
 
 static void