Revert "remove getenv() function." 55/233655/1
authorSeunghun Lee <shiin.lee@samsung.com>
Mon, 18 May 2020 05:13:08 +0000 (14:13 +0900)
committerSeunghun Lee <shiin.lee@samsung.com>
Mon, 18 May 2020 05:14:42 +0000 (14:14 +0900)
it needs to be more verified.

This reverts commit df7381bc4111c24cbe7363dd039572332270230b.

Change-Id: If7c555fd0a9ca4159abb5b7de906a0e2b5016eab

src/tbm_backend.c
src/tbm_bufmgr.c
src/tbm_bufmgr_backend.c

index cd241b2..4c9ce19 100644 (file)
@@ -38,13 +38,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 int
 tbm_backend_bufmgr_query_display_server(tbm_bufmgr bufmgr, tbm_error_e *error)
 {
+       const char *value;
+
        if (!bufmgr) {
                if (error)
                        *error = TBM_ERROR_INVALID_PARAMETER;
                return 0;
        }
 
-       if (gBufMgr->display_server) {
+       /* TODO: TBM_DISPLAY_SERVER will be removed */
+       value = (const char*)getenv("TBM_DISPLAY_SERVER");
+
+       if (value || gBufMgr->display_server) {
                if (error)
                        *error = TBM_ERROR_NONE;
                return 1;
index d80f7ec..eefe8e8 100644 (file)
@@ -480,7 +480,16 @@ _tbm_bufmgr_init(int fd, int server)
 #endif
 
        bDlog = 1;
-       trace_mask = 0;
+
+       /* LCOV_EXCL_START */
+#ifdef TRACE
+       env = getenv("TBM_TRACE");
+       if (env) {
+               trace_mask = atoi(env);
+               TBM_DBG("TBM_TRACE=%s\n", env);
+       } else
+               trace_mask = 0;
+#endif
 
        pthread_mutex_lock(&gLock);
 
index 11aa5eb..87d3c78 100644 (file)
@@ -110,12 +110,17 @@ void *tbm_backend_get_bo_priv(tbm_bo bo)
 
 int tbm_backend_is_display_server(void)
 {
+       const char *value;
+
        if (gBufMgr == NULL) {
                TBM_ERR("error: no gBufMgr.\n");
                return 0;
        }
 
-       if (gBufMgr->display_server)
+       /* TODO: TBM_DISPLAY_SERVER will be removed */
+       value = (const char*)getenv("TBM_DISPLAY_SERVER");
+
+       if (value || gBufMgr->display_server)
                return 1;
 
        return 0;