diff options
| author |   satok <satok@google.com> | 2011-07-13 14:40:30 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-07-13 15:21:10 +0900 |
| commit | 20d9fdae3ac12a7efa6daf6f582a3d5a4311a375 (patch) | |
| tree | cb44a9a800b36ffbde90a237dbd84f63a1fa6d6d | |
| parent | e0d3922ba3c328651d4982f01989c3ce15dee3c0 (diff) | |
| download | latinime-20d9fdae3ac12a7efa6daf6f582a3d5a4311a375.tar.gz latinime-20d9fdae3ac12a7efa6daf6f582a3d5a4311a375.tar.xz latinime-20d9fdae3ac12a7efa6daf6f582a3d5a4311a375.zip | |
Add a flag for a profiling
Change-Id: Iae509a24fd0f0f416376c3f8051aa2eb92d48659
| -rw-r--r-- | native/Android.mk | 8 | ||||
| -rw-r--r-- | native/src/defines.h | 48 |
2 files changed, 33 insertions, 23 deletions
diff --git a/native/Android.mk b/native/Android.mk index d9f4f1d38..c22191319 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -19,6 +19,7 @@ LOCAL_SRC_FILES := \ src/unigram_dictionary.cpp #FLAG_DBG := true +#FLAG_DO_PROFILE := true TARGETING_UNBUNDLED_FROYO := true @@ -39,10 +40,15 @@ LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := user +ifeq ($(FLAG_DO_PROFILE), true) + $(warning Making profiling version of native library) + LOCAL_CFLAGS += -DFLAG_DO_PROFILE +else # FLAG_DO_PROFILE ifeq ($(FLAG_DBG), true) $(warning Making debug version of native library) LOCAL_CFLAGS += -DFLAG_DBG LOCAL_SHARED_LIBRARIES := libcutils libutils -endif +endif # FLAG_DBG +endif # FLAG_DO_PROFILE include $(BUILD_SHARED_LIBRARY) diff --git a/native/src/defines.h b/native/src/defines.h index 0a3240507..14c64fab3 100644 --- a/native/src/defines.h +++ b/native/src/defines.h @@ -18,18 +18,7 @@ #ifndef LATINIME_DEFINES_H #define LATINIME_DEFINES_H -#ifdef FLAG_DBG -#include <cutils/log.h> -#ifndef LOG_TAG -#define LOG_TAG "LatinIME: " -#endif -#define DEBUG_DICT true -#define DEBUG_DICT_FULL false -#define DEBUG_SHOW_FOUND_WORD DEBUG_DICT_FULL -#define DEBUG_NODE DEBUG_DICT_FULL -#define DEBUG_TRACE DEBUG_DICT_FULL -#define DEBUG_PROXIMITY_INFO true - +#ifdef FLAG_DO_PROFILE // Profiler #include <time.h> #define PROF_BUF_SIZE 100 @@ -76,16 +65,7 @@ static void prof_out(void) { } } -#else // FLAG_DBG -#define LOGE(fmt, ...) -#define LOGI(fmt, ...) -#define DEBUG_DICT false -#define DEBUG_DICT_FULL false -#define DEBUG_SHOW_FOUND_WORD false -#define DEBUG_NODE false -#define DEBUG_TRACE false -#define DEBUG_PROXIMITY_INFO false - +#else // FLAG_DO_PROFILE #define PROF_BUF_SIZE 0 #define PROF_RESET #define PROF_COUNT(prof_buf_id) @@ -97,6 +77,30 @@ static void prof_out(void) { #define PROF_CLOCKOUT(prof_buf_id) #define PROF_OUTALL +#endif // FLAG_DO_PROFILE + +#ifdef FLAG_DBG +#include <cutils/log.h> +#ifndef LOG_TAG +#define LOG_TAG "LatinIME: " +#endif +#define DEBUG_DICT true +#define DEBUG_DICT_FULL false +#define DEBUG_SHOW_FOUND_WORD DEBUG_DICT_FULL +#define DEBUG_NODE DEBUG_DICT_FULL +#define DEBUG_TRACE DEBUG_DICT_FULL +#define DEBUG_PROXIMITY_INFO true + +#else // FLAG_DBG +#define LOGE(fmt, ...) +#define LOGI(fmt, ...) +#define DEBUG_DICT false +#define DEBUG_DICT_FULL false +#define DEBUG_SHOW_FOUND_WORD false +#define DEBUG_NODE false +#define DEBUG_TRACE false +#define DEBUG_PROXIMITY_INFO false + #endif // FLAG_DBG #ifndef U_SHORT_MAX |