projects / platform / core / uifw / libtdm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lock/unlock outside of the helper function
[platform/core/uifw/libtdm.git] / src / tdm_helper.c
diff --git a/src/tdm_helper.c b/src/tdm_helper.c
index 90dd618..cf05aa0 100644 (file)
--- a/src/tdm_helper.c
+++ b/src/tdm_helper.c
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <time.h>
 #include <pixman.h>
+#include <inttypes.h>
 
 #include "tdm.h"
 #include "tdm_private.h"
@@ -547,7 +548,7 @@ tdm_helper_get_fd(const char *env)
        if (!value)
                return -1;
 
-       const long sl = strtol(value, &end, 10);
+       const long int sl = strtol(value, &end, 10);
        if (end == value) {
                TDM_ERR("%s: not a decimal number\n", value);
                return -1;
@@ -557,10 +558,10 @@ tdm_helper_get_fd(const char *env)
        } else if ((sl == LONG_MIN || sl == LONG_MAX) && errno == ERANGE) {
                TDM_ERR("%s out of range of type long\n", value);
                return -1;
-       } else if (sl > INT_MAX) {
+       } else if (sl >= INT_MAX) {
                TDM_ERR("%ld greater than INT_MAX\n", sl);
                return -1;
-       } else if (sl < INT_MIN) {
+       } else if (sl <= INT_MIN) {
                TDM_ERR("%ld less than INT_MIN\n", sl);
                return -1;
        } else {
@@ -788,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;
@@ -824,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++) {
@@ -854,18 +854,36 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
 
                TDM_SNPRINTF(reply, len, "\t%d properties:\n", private_output->caps.prop_count);
                if (private_output->caps.prop_count > 0) {
-                       TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+                       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_SNPRINTF(reply, len, "\t\t%s\t%u\t%u\n",
+                               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,
-                                                        private_output->caps.props[i].id,
-                                                        value.u32);
+                                                        tdm_value_type_str(private_output->caps.props[i].type),
+                                                        private_output->caps.props[i].id);
+                               switch (private_output->caps.props[i].type) {
+                               case TDM_VALUE_TYPE_PTR:
+                                       TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+                                       break;
+                               case TDM_VALUE_TYPE_INT32:
+                                       TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+                                       break;
+                               case TDM_VALUE_TYPE_INT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT32:
+                               default:
+                                       TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+                                       break;
+                               }
                        }
                }
        }
@@ -884,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;
@@ -937,18 +955,36 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
 
                        TDM_SNPRINTF(reply, len, "\t%u properties:\n", private_layer->caps.prop_count);
                        if (private_layer->caps.prop_count > 0) {
-                               TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+                               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_SNPRINTF(reply, len, "\t\t%s\t%u\t%u\n",
+                                       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,
-                                                                private_layer->caps.props[i].id,
-                                                                value.u32);
+                                                                tdm_value_type_str(private_output->caps.props[i].type),
+                                                                private_layer->caps.props[i].id);
+                               switch (private_layer->caps.props[i].type) {
+                               case TDM_VALUE_TYPE_PTR:
+                                       TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+                                       break;
+                               case TDM_VALUE_TYPE_INT32:
+                                       TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+                                       break;
+                               case TDM_VALUE_TYPE_INT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT32:
+                               default:
+                                       TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+                                       break;
+                               }
                                }
                        }
                }
@@ -1037,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
Domain: Graphics System / Display Management;