getpid=>hv_getpid gettid=>hv_gettid

base/hthread.h

@@ -5,16 +5,24 @@
 #include "hdef.h"
 
 #ifdef OS_WIN
-#define gettid  GetCurrentThreadId
-#elif HAVE_GETTID
-#elif defined(OS_ANDROID)
+#define hv_getpid   (long)GetCurrentProcessId
+#else
+#define hv_getpid   (long)getpid
+#endif
+
+#ifdef OS_WIN
+#define hv_gettid   (long)GetCurrentThreadId
+#elif HAVE_GETTID || defined(OS_ANDROID)
+#define hv_gettid   (long)gettid
 #elif defined(OS_LINUX)
 #include <sys/syscall.h>
-static inline int gettid() {
+static inline long hv_gettid() {
     return syscall(SYS_gettid);
 }
 #elif HAVE_PTHREAD_H
-#define gettid  pthread_self
+#define hv_gettid   (long)pthread_self
+#else
+#define hv_gettid   hv_getpid
 #endif
 
 #ifdef OS_WIN

examples/hmain_test.cpp

@@ -278,7 +278,7 @@ int main(int argc, char** argv) {
 void worker_fn(void* userdata) {
     long num = (long)(intptr_t)(userdata);
     while (1) {
-        printf("num=%ld pid=%d tid=%ld\n", num, getpid(), (long)gettid());
+        printf("num=%ld pid=%ld tid=%ld\n", num, hv_getpid(), hv_gettid());
         sleep(60);
     }
 }

unittest/threadpool_test.cpp

@@ -4,7 +4,7 @@
 #include "htime.h"
 
 void print_task(int i) {
-    printf("thread[%ld]: task[%d]\n", (long)gettid(), i);
+    printf("thread[%ld]: task[%d]\n", hv_gettid(), i);
     sleep(1);
 }
 

utils/hmain.cpp

@@ -526,7 +526,7 @@ void handle_signal(const char* signal) {
 
 // master-workers processes
 static HTHREAD_ROUTINE(worker_thread) {
-    hlogi("worker_thread pid=%d tid=%ld", getpid(), (long)gettid());
+    hlogi("worker_thread pid=%ld tid=%ld", hv_getpid(), hv_gettid());
     if (g_worker_fn) {
         g_worker_fn(g_worker_userdata);
     }