From 0cba405924f31e64e6abba52fa7572998cb4a9f2 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 18 May 2020 14:13:08 +0900 Subject: [PATCH] Revert "remove getenv() function." it needs to be more verified. This reverts commit df7381bc4111c24cbe7363dd039572332270230b. Change-Id: If7c555fd0a9ca4159abb5b7de906a0e2b5016eab --- src/tbm_backend.c | 7 ++++++- src/tbm_bufmgr.c | 11 ++++++++++- src/tbm_bufmgr_backend.c | 7 ++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/tbm_backend.c b/src/tbm_backend.c index cd241b2..4c9ce19 100644 --- a/src/tbm_backend.c +++ b/src/tbm_backend.c @@ -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; diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index d80f7ec..eefe8e8 100644 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -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); diff --git a/src/tbm_bufmgr_backend.c b/src/tbm_bufmgr_backend.c index 11aa5eb..87d3c78 100644 --- a/src/tbm_bufmgr_backend.c +++ b/src/tbm_bufmgr_backend.c @@ -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; -- 2.7.4