diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index a19579b7d4f0a7eed9b06ea45924a38f989fead5..d958679544093b54e4c5090557376ac8f96abc43 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -61,13 +61,13 @@ jmethodID g_rowdataSetByteArrayFp;
 
 void jniGetGlobalMethod(JNIEnv *env) {
   // make sure init function executed once
-  switch (__sync_val_compare_and_swap_32(&__init, 0, 1)) {
+  switch (atomic_val_compare_exchange_32(&__init, 0, 1)) {
     case 0:
       break;
     case 1:
       do {
         taosMsleep(0);
-      } while (__sync_val_load_32(&__init) == 1);
+      } while (atomic_load_32(&__init) == 1);
     case 2:
       return;
   }
@@ -107,7 +107,7 @@ void jniGetGlobalMethod(JNIEnv *env) {
   g_rowdataSetByteArrayFp = (*env)->GetMethodID(env, g_rowdataClass, "setByteArray", "(I[B)V");
   (*env)->DeleteLocalRef(env, rowdataClass);
 
-  __sync_val_restore_32(&__init, 2);
+  atomic_store_32(&__init, 2);
   jniTrace("native method register finished");
 }
 
diff --git a/src/client/src/tscJoinProcess.c b/src/client/src/tscJoinProcess.c
index dfeebc8c61e868b9b7c558287b40ad0fbc093099..24d8ad902acb683f3b3ae05c10a5ff92181695df 100644
--- a/src/client/src/tscJoinProcess.c
+++ b/src/client/src/tscJoinProcess.c
@@ -353,7 +353,7 @@ static void doQuitSubquery(SSqlObj* pParentSql) {
 }
 
 static void quitAllSubquery(SSqlObj* pSqlObj, SJoinSubquerySupporter* pSupporter) {
-  if (__sync_add_and_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
+  if (atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
     pSqlObj->res.code = abs(pSupporter->pState->code);
     tscError("%p all subquery return and query failed, global code:%d", pSqlObj, pSqlObj->res.code);
 
@@ -412,7 +412,7 @@ static void joinRetrieveCallback(void* param, TAOS_RES* tres, int numOfRows) {
 
       taos_fetch_rows_a(tres, joinRetrieveCallback, param);
     } else if (numOfRows == 0) { // no data from this vnode anymore
-      if (__sync_add_and_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
+      if (atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
 
         if (pSupporter->pState->code != TSDB_CODE_SUCCESS) {
           tscTrace("%p sub:%p, numOfSub:%d, quit from further procedure due to other queries failure", pParentSql, tres,
@@ -451,7 +451,7 @@ static void joinRetrieveCallback(void* param, TAOS_RES* tres, int numOfRows) {
       tscError("%p retrieve failed, code:%d, index:%d", pSql, numOfRows, pSupporter->subqueryIndex);
     }
 
-    if (__sync_add_and_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
+    if (atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
       tscTrace("%p secondary retrieve completed, global code:%d", tres, pParentSql->res.code);
       if (pSupporter->pState->code != TSDB_CODE_SUCCESS) {
         pParentSql->res.code = abs(pSupporter->pState->code);
@@ -560,7 +560,7 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
 
   SJoinSubquerySupporter* pSupporter = (SJoinSubquerySupporter*)param;
 
-  //  if (__sync_add_and_fetch_32(pSupporter->numOfComplete, 1) >=
+  //  if (atomic_add_fetch_32(pSupporter->numOfComplete, 1) >=
   //      pSupporter->numOfTotal) {
   //    SSqlObj *pParentObj = pSupporter->pObj;
   //
@@ -605,7 +605,7 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
 
       quitAllSubquery(pParentSql, pSupporter);
     } else {
-      if (__sync_add_and_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
+      if (atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1) >= pSupporter->pState->numOfTotal) {
         tscSetupOutputColumnIndex(pParentSql);
 
         if (pParentSql->fp == NULL) {
diff --git a/src/client/src/tscSecondaryMerge.c b/src/client/src/tscSecondaryMerge.c
index 398cd1cca6ceb4de0042788e78ab3336448019ed..c1fe0c8674e45d158e35be175ad34f47c781fa38 100644
--- a/src/client/src/tscSecondaryMerge.c
+++ b/src/client/src/tscSecondaryMerge.c
@@ -432,11 +432,10 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
 
   // there is no more result, so we release all allocated resource
-  SLocalReducer *pLocalReducer =
-      (SLocalReducer *)__sync_val_compare_and_swap_64(&pRes->pLocalReducer, pRes->pLocalReducer, 0);
+  SLocalReducer *pLocalReducer = (SLocalReducer*)atomic_exchange_ptr(&pRes->pLocalReducer, NULL);
   if (pLocalReducer != NULL) {
     int32_t status = 0;
-    while ((status = __sync_val_compare_and_swap_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY,
+    while ((status = atomic_val_compare_exchange_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY,
                                                     TSC_LOCALREDUCE_TOBE_FREED)) == TSC_LOCALREDUCE_IN_PROGRESS) {
       taosMsleep(100);
       tscTrace("%p waiting for delete procedure, status: %d", pSql, status);
@@ -1328,7 +1327,7 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
 
   // set the data merge in progress
   int32_t prevStatus =
-      __sync_val_compare_and_swap_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY, TSC_LOCALREDUCE_IN_PROGRESS);
+      atomic_val_compare_exchange_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY, TSC_LOCALREDUCE_IN_PROGRESS);
   if (prevStatus != TSC_LOCALREDUCE_READY || pLocalReducer == NULL) {
     assert(prevStatus == TSC_LOCALREDUCE_TOBE_FREED); // it is in tscDestroyLocalReducer function already
     return TSDB_CODE_SUCCESS;
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 67118b50e2db7994734d7ebb0245b0140f5e21a2..6dc28661e57137b93b6a412ef93afc0a92bbdadc 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1023,13 +1023,13 @@ static void tscHandleSubRetrievalError(SRetrieveSupport *trsupport, SSqlObj *pSq
       tscProcessSql(pNew);
       return;
     } else {  // reach the maximum retry count, abort
-      __sync_val_compare_and_swap_32(&trsupport->pState->code, TSDB_CODE_SUCCESS, numOfRows);
+      atomic_val_compare_exchange_32(&trsupport->pState->code, TSDB_CODE_SUCCESS, numOfRows);
       tscError("%p sub:%p retrieve failed,code:%d,orderOfSub:%d failed.no more retry,set global code:%d", pPObj, pSql,
                numOfRows, idx, trsupport->pState->code);
     }
   }
 
-  if (__sync_add_and_fetch_32(&trsupport->pState->numOfCompleted, 1) < trsupport->pState->numOfTotal) {
+  if (atomic_add_fetch_32(&trsupport->pState->numOfCompleted, 1) < trsupport->pState->numOfTotal) {
     return tscFreeSubSqlObj(trsupport, pSql);
   }
 
@@ -1095,7 +1095,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
 
   if (numOfRows > 0) {
     assert(pRes->numOfRows == numOfRows);
-    __sync_add_and_fetch_64(&trsupport->pState->numOfRetrievedRows, numOfRows);
+    atomic_add_fetch_64(&trsupport->pState->numOfRetrievedRows, numOfRows);
 
     tscTrace("%p sub:%p retrieve numOfRows:%d totalNumOfRows:%d from ip:%u,vid:%d,orderOfSub:%d", pPObj, pSql,
              pRes->numOfRows, trsupport->pState->numOfRetrievedRows, pSvd->ip, pSvd->vnode, idx);
@@ -1154,7 +1154,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
       return tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_CLI_NO_DISKSPACE);
     }
 
-    if (__sync_add_and_fetch_32(&trsupport->pState->numOfCompleted, 1) < trsupport->pState->numOfTotal) {
+    if (atomic_add_fetch_32(&trsupport->pState->numOfCompleted, 1) < trsupport->pState->numOfTotal) {
       return tscFreeSubSqlObj(trsupport, pSql);
     }
 
@@ -1283,7 +1283,7 @@ void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
   if (code != TSDB_CODE_SUCCESS) {
     if (trsupport->numOfRetry++ >= MAX_NUM_OF_SUBQUERY_RETRY) {
       tscTrace("%p sub:%p reach the max retry count,set global code:%d", trsupport->pParentSqlObj, pSql, code);
-      __sync_val_compare_and_swap_32(&trsupport->pState->code, 0, code);
+      atomic_val_compare_exchange_32(&trsupport->pState->code, 0, code);
     } else {  // does not reach the maximum retry count, go on
       tscTrace("%p sub:%p failed code:%d, retry:%d", trsupport->pParentSqlObj, pSql, code, trsupport->numOfRetry);
 
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index ec8233c6f9519e27ce4c702742bc82b058421183..c9809be1e3d11bb78c79ae4e46398370a82ceca1 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -546,7 +546,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
 void taos_close_stream(TAOS_STREAM *handle) {
   SSqlStream *pStream = (SSqlStream *)handle;
 
-  SSqlObj *pSql = (SSqlObj *)__sync_val_compare_and_swap_64(&pStream->pSql, pStream->pSql, 0);
+  SSqlObj *pSql = (SSqlObj *)atomic_exchange_ptr(&pStream->pSql, 0);
   if (pSql == NULL) {
     return;
   }
diff --git a/src/modules/http/src/httpServer.c b/src/modules/http/src/httpServer.c
index 8b981e0f844e9e803ed1e1159aa188313818c79e..49ff3562bfce15e594c2033881474d591cfc92a1 100644
--- a/src/modules/http/src/httpServer.c
+++ b/src/modules/http/src/httpServer.c
@@ -72,7 +72,7 @@ void httpRemoveContextFromEpoll(HttpThread *pThread, HttpContext *pContext) {
 }
 
 bool httpAlterContextState(HttpContext *pContext, HttpContextState srcState, HttpContextState destState) {
-  return (__sync_val_compare_and_swap_32(&pContext->state, srcState, destState) == srcState);
+  return (atomic_val_compare_exchange_32(&pContext->state, srcState, destState) == srcState);
 }
 
 void httpFreeContext(HttpServer *pServer, HttpContext *pContext);
@@ -124,7 +124,7 @@ void httpCleanUpContextTimer(HttpContext *pContext) {
 
 void httpCleanUpContext(HttpContext *pContext) {
   httpTrace("context:%p, start the clean up operation", pContext);
-  __sync_val_compare_and_swap_64(&pContext->signature, pContext, 0);
+  atomic_val_compare_exchange_ptr(&pContext->signature, pContext, 0);
   if (pContext->signature != NULL) {
     httpTrace("context:%p is freed by another thread.", pContext);
     return;
@@ -494,7 +494,7 @@ void httpProcessHttpData(void *param) {
       } else {
         if (httpReadData(pThread, pContext)) {
           (*(pThread->processData))(pContext);
-          __sync_fetch_and_add(&pThread->pServer->requestNum, 1);
+          atomic_fetch_add_32(&pThread->pServer->requestNum, 1);
         }
       }
     }
diff --git a/src/modules/http/src/httpSystem.c b/src/modules/http/src/httpSystem.c
index ece7c1781475345724b5b706a91e234263ab8c28..67be206842c4be2cab30c1814d9b666b1602f9b1 100644
--- a/src/modules/http/src/httpSystem.c
+++ b/src/modules/http/src/httpSystem.c
@@ -148,7 +148,7 @@ void httpCleanUpSystem() {
 
 void httpGetReqCount(int32_t *httpReqestNum) {
   if (httpServer != NULL) {
-    *httpReqestNum = __sync_fetch_and_and(&httpServer->requestNum, 0);
+    *httpReqestNum = atomic_exchange_32(&httpServer->requestNum, 0);
   } else {
     *httpReqestNum = 0;
   }
diff --git a/src/os/darwin/inc/os.h b/src/os/darwin/inc/os.h
index 83a56483b8463155a91c3e15cf5ff0db39d8d600..eabd5cd221ba2f72a2082273b7afc17825e40695 100644
--- a/src/os/darwin/inc/os.h
+++ b/src/os/darwin/inc/os.h
@@ -73,28 +73,71 @@
 #define atomic_exchange_64(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
 #define atomic_exchange_ptr(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
 
-// TODO: update prefix of below macros to 'atomic' as '__' is reserved by compiler
-// and GCC suggest new code to use '__atomic' builtins to replace '__sync' builtins.
-#define __sync_val_compare_and_swap_64 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_32 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_16 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_8 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_ptr __sync_val_compare_and_swap
-
-#define __sync_add_and_fetch_64 __sync_add_and_fetch
-#define __sync_add_and_fetch_32 __sync_add_and_fetch
-#define __sync_add_and_fetch_16 __sync_add_and_fetch
-#define __sync_add_and_fetch_8 __sync_add_and_fetch
-#define __sync_add_and_fetch_ptr __sync_add_and_fetch
-
-#define __sync_sub_and_fetch_64 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_32 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_16 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_8 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_ptr __sync_sub_and_fetch
-
-int32_t __sync_val_load_32(int32_t *ptr);
-void __sync_val_restore_32(int32_t *ptr, int32_t newval);
+#define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_16 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_32 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_64 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_ptr __sync_val_compare_and_swap
+
+#define atomic_add_fetch_8(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_16(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_32(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_64(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_ptr(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_add_8(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_16(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_32(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_64(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_ptr(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_sub_fetch_8(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_16(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_32(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_64(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_ptr(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_sub_8(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_16(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_32(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_64(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_ptr(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_and_fetch_8(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_16(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_32(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_64(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_ptr(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_and_8(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_16(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_32(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_64(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_ptr(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_or_fetch_8(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_16(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_32(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_64(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_ptr(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_or_8(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_16(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_32(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_64(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_ptr(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_xor_fetch_8(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_16(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_32(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_64(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_ptr(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_xor_8(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_16(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_32(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_64(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_ptr(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
 
 #define SWAP(a, b, c)      \
   do {                     \
diff --git a/src/os/darwin/src/tdarwin.c b/src/os/darwin/src/tdarwin.c
index 2f97c7c37699a769186cb57fc7e4e47274a1629c..eec252d6608b07ea8c740ab8e318413b37b4b4d4 100644
--- a/src/os/darwin/src/tdarwin.c
+++ b/src/os/darwin/src/tdarwin.c
@@ -416,11 +416,3 @@ int tsem_post(dispatch_semaphore_t *sem) {
 int tsem_destroy(dispatch_semaphore_t *sem) {
   return 0;
 }
-
-int32_t __sync_val_load_32(int32_t *ptr) {
-  return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
-}
-
-void __sync_val_restore_32(int32_t *ptr, int32_t newval) {
-  __atomic_store_n(ptr, newval, __ATOMIC_RELEASE);
-}
\ No newline at end of file
diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h
index ee65965a5b44420f12ee6c053879908282999a09..b9bb8b3e10b31795f4003951062b80913ee2213f 100644
--- a/src/os/linux/inc/os.h
+++ b/src/os/linux/inc/os.h
@@ -90,28 +90,71 @@ extern "C" {
 #define atomic_exchange_64(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
 #define atomic_exchange_ptr(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
 
-// TODO: update prefix of below macros to 'atomic' as '__' is reserved by compiler
-// and GCC suggest new code to use '__atomic' builtins to replace '__sync' builtins.
-#define __sync_val_compare_and_swap_64 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_32 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_16 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_8 __sync_val_compare_and_swap
-#define __sync_val_compare_and_swap_ptr __sync_val_compare_and_swap
-
-#define __sync_add_and_fetch_64 __sync_add_and_fetch
-#define __sync_add_and_fetch_32 __sync_add_and_fetch
-#define __sync_add_and_fetch_16 __sync_add_and_fetch
-#define __sync_add_and_fetch_8 __sync_add_and_fetch
-#define __sync_add_and_fetch_ptr __sync_add_and_fetch
-
-#define __sync_sub_and_fetch_64 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_32 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_16 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_8 __sync_sub_and_fetch
-#define __sync_sub_and_fetch_ptr __sync_sub_and_fetch
-
-int32_t __sync_val_load_32(int32_t *ptr);
-void    __sync_val_restore_32(int32_t *ptr, int32_t newval);
+#define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_16 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_32 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_64 __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_ptr __sync_val_compare_and_swap
+
+#define atomic_add_fetch_8(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_16(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_32(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_64(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_add_fetch_ptr(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_add_8(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_16(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_32(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_64(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_ptr(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_sub_fetch_8(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_16(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_32(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_64(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_sub_fetch_ptr(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_sub_8(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_16(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_32(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_64(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_ptr(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_and_fetch_8(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_16(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_32(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_64(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_and_fetch_ptr(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_and_8(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_16(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_32(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_64(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_ptr(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_or_fetch_8(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_16(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_32(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_64(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_or_fetch_ptr(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_or_8(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_16(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_32(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_64(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_ptr(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_xor_fetch_8(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_16(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_32(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_64(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_xor_fetch_ptr(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+#define atomic_fetch_xor_8(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_16(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_32(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_64(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_ptr(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
 
 #define SWAP(a, b, c)      \
   do {                     \
diff --git a/src/os/linux/src/tlinux.c b/src/os/linux/src/tlinux.c
index b5271006e251e2de81443f1127053b1db4f7672a..f78250cb52629b533048628ac1ffa1bcdb9dd1b8 100644
--- a/src/os/linux/src/tlinux.c
+++ b/src/os/linux/src/tlinux.c
@@ -340,11 +340,3 @@ bool taosSkipSocketCheck() {
 
   return false;
 }
-
-int32_t __sync_val_load_32(int32_t *ptr) {
-  return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
-}
-
-void __sync_val_restore_32(int32_t *ptr, int32_t newval) {
-  __atomic_store_n(ptr, newval, __ATOMIC_RELEASE);
-}
diff --git a/src/os/windows/inc/os.h b/src/os/windows/inc/os.h
index 3f61ff12b53fdca1c60d827978109dcbdffc6318..a1a4bdfa5c47e97010c05451a97ea363de928d60 100644
--- a/src/os/windows/inc/os.h
+++ b/src/os/windows/inc/os.h
@@ -81,6 +81,10 @@ extern "C" {
 
 #if defined(_M_ARM) || defined(_M_ARM64)
 
+/* the '__iso_volatile' functions does not use a memory fence, so these
+ * definitions are incorrect, comment out as we don't support Windows on
+ * ARM at present.
+
 #define atomic_load_8(ptr) __iso_volatile_load8((const volatile __int8*)(ptr))
 #define atomic_load_16(ptr) __iso_volatile_load16((const volatile __int16*)(ptr))
 #define atomic_load_32(ptr) __iso_volatile_load32((const volatile __int32*)(ptr))
@@ -98,7 +102,7 @@ extern "C" {
 #define atomic_load_ptr atomic_load_32
 #define atomic_store_ptr atomic_store_32
 #endif
-
+*/
 #else
 
 #define atomic_load_8(ptr) (*(char volatile*)(ptr))
@@ -121,35 +125,152 @@ extern "C" {
 #define atomic_exchange_64(ptr, val) _InterlockedExchange64((__int64 volatile*)(ptr), (__int64)(val))
 #define atomic_exchange_ptr(ptr, val) _InterlockedExchangePointer((void* volatile*)(ptr), (void*)(val))
 
-#define __sync_val_compare_and_swap_8(ptr, oldval, newval) _InterlockedCompareExchange8((char volatile*)(ptr), (char)(newval), (char)(oldval))
-#define __sync_val_compare_and_swap_16(ptr, oldval, newval) _InterlockedCompareExchange16((short volatile*)(ptr), (short)(newval), (short)(oldval))
-#define __sync_val_compare_and_swap_32(ptr, oldval, newval) _InterlockedCompareExchange((long volatile*)(ptr), (long)(newval), (long)(oldval))
-#define __sync_val_compare_and_swap_64(ptr, oldval, newval) _InterlockedCompareExchange64((__int64 volatile*)(ptr), (__int64)(newval), (__int64)(oldval))
-#define __sync_val_compare_and_swap_ptr(ptr, oldval, newval) _InterlockedCompareExchangePointer((void* volatile*)(ptr), (void*)(newval), (void*)(oldval))
-
-char    interlocked_add_8(char volatile *ptr, char val);
-short   interlocked_add_16(short volatile *ptr, short val);
-long    interlocked_add_32(long volatile *ptr, long val);
-__int64 interlocked_add_64(__int64 volatile *ptr, __int64 val);
-
-#define __sync_add_and_fetch_8(ptr, val) interlocked_add_8((char volatile*)(ptr), (char)(val))
-#define __sync_add_and_fetch_16(ptr, val) interlocked_add_16((short volatile*)(ptr), (short)(val))
-#define __sync_add_and_fetch_32(ptr, val) interlocked_add_32((long volatile*)(ptr), (long)(val))
-#define __sync_add_and_fetch_64(ptr, val) interlocked_add_64((__int64 volatile*)(ptr), (__int64)(val))
+#define atomic_val_compare_exchange_8(ptr, oldval, newval) _InterlockedCompareExchange8((char volatile*)(ptr), (char)(newval), (char)(oldval))
+#define atomic_val_compare_exchange_16(ptr, oldval, newval) _InterlockedCompareExchange16((short volatile*)(ptr), (short)(newval), (short)(oldval))
+#define atomic_val_compare_exchange_32(ptr, oldval, newval) _InterlockedCompareExchange((long volatile*)(ptr), (long)(newval), (long)(oldval))
+#define atomic_val_compare_exchange_64(ptr, oldval, newval) _InterlockedCompareExchange64((__int64 volatile*)(ptr), (__int64)(newval), (__int64)(oldval))
+#define atomic_val_compare_exchange_ptr(ptr, oldval, newval) _InterlockedCompareExchangePointer((void* volatile*)(ptr), (void*)(newval), (void*)(oldval))
+
+char    interlocked_add_fetch_8(char volatile *ptr, char val);
+short   interlocked_add_fetch_16(short volatile *ptr, short val);
+long    interlocked_add_fetch_32(long volatile *ptr, long val);
+__int64 interlocked_add_fetch_64(__int64 volatile *ptr, __int64 val);
+
+#define atomic_add_fetch_8(ptr, val) interlocked_add_fetch_8((char volatile*)(ptr), (char)(val))
+#define atomic_add_fetch_16(ptr, val) interlocked_add_fetch_16((short volatile*)(ptr), (short)(val))
+#define atomic_add_fetch_32(ptr, val) interlocked_add_fetch_32((long volatile*)(ptr), (long)(val))
+#define atomic_add_fetch_64(ptr, val) interlocked_add_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+#ifdef _WIN64
+  #define atomic_add_fetch_ptr atomic_add_fetch_64
+#else
+  #define atomic_add_fetch_ptr atomic_add_fetch_32
+#endif
+
+#define atomic_fetch_add_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), (char)(val))
+#define atomic_fetch_add_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), (short)(val))
+#define atomic_fetch_add_32(ptr, val) _InterlockedExchangeAdd((long volatile*)(ptr), (long)(val))
+#define atomic_fetch_add_64(ptr, val) _InterlockedExchangeAdd64((__int64 volatile*)(ptr), (__int64)(val))
+#ifdef _WIN64
+  #define atomic_fetch_add_ptr atomic_fetch_add_64
+#else
+  #define atomic_fetch_add_ptr atomic_fetch_add_32
+#endif
+
+#define atomic_sub_fetch_8(ptr, val) interlocked_add_fetch_8((char volatile*)(ptr), -(char)(val))
+#define atomic_sub_fetch_16(ptr, val) interlocked_add_fetch_16((short volatile*)(ptr), -(short)(val))
+#define atomic_sub_fetch_32(ptr, val) interlocked_add_fetch_32((long volatile*)(ptr), -(long)(val))
+#define atomic_sub_fetch_64(ptr, val) interlocked_add_fetch_64((__int64 volatile*)(ptr), -(__int64)(val))
+#ifdef _WIN64
+  #define atomic_sub_fetch_ptr atomic_sub_fetch_64
+#else
+  #define atomic_sub_fetch_ptr atomic_sub_fetch_32
+#endif
+
+#define atomic_fetch_sub_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), -(char)(val))
+#define atomic_fetch_sub_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), -(short)(val))
+#define atomic_fetch_sub_32(ptr, val) _InterlockedExchangeAdd((long volatile*)(ptr), -(long)(val))
+#define atomic_fetch_sub_64(ptr, val) _InterlockedExchangeAdd64((__int64 volatile*)(ptr), -(__int64)(val))
+#ifdef _WIN64
+  #define atomic_fetch_sub_ptr atomic_fetch_sub_64
+#else
+  #define atomic_fetch_sub_ptr atomic_fetch_sub_32
+#endif
+
+char interlocked_and_fetch_8(char volatile* ptr, char val);
+short interlocked_and_fetch_16(short volatile* ptr, short val);
+long interlocked_and_fetch_32(long volatile* ptr, long val);
+__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val);
+
+#define atomic_and_fetch_8(ptr, val) interlocked_and_fetch_8((char volatile*)(ptr), (char)(val))
+#define atomic_and_fetch_16(ptr, val) interlocked_and_fetch_16((short volatile*)(ptr), (short)(val))
+#define atomic_and_fetch_32(ptr, val) interlocked_and_fetch_32((long volatile*)(ptr), (long)(val))
+#define atomic_and_fetch_64(ptr, val) interlocked_and_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+#ifdef _WIN64
+  #define atomic_and_fetch_ptr atomic_and_fetch_64
+#else
+  #define atomic_and_fetch_ptr atomic_and_fetch_32
+#endif
+
+#define atomic_fetch_and_8(ptr, val) _InterlockedAnd8((char volatile*)(ptr), (char)(val))
+#define atomic_fetch_and_16(ptr, val) _InterlockedAnd16((short volatile*)(ptr), (short)(val))
+#define atomic_fetch_and_32(ptr, val) _InterlockedAnd((long volatile*)(ptr), (long)(val))
+
+#ifdef _M_IX86
+  __int64 interlocked_fetch_and_64(__int64 volatile* ptr, __int64 val);
+  #define atomic_fetch_and_64(ptr, val) interlocked_fetch_and_64((__int64 volatile*)(ptr), (__int64)(val))
+#else
+  #define atomic_fetch_and_64(ptr, val) _InterlockedAnd64((__int64 volatile*)(ptr), (__int64)(val))
+#endif
+
+#ifdef _WIN64
+  #define atomic_fetch_and_ptr atomic_fetch_and_64
+#else
+  #define atomic_fetch_and_ptr atomic_fetch_and_32
+#endif
+
+char interlocked_or_fetch_8(char volatile* ptr, char val);
+short interlocked_or_fetch_16(short volatile* ptr, short val);
+long interlocked_or_fetch_32(long volatile* ptr, long val);
+__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val);
+
+#define atomic_or_fetch_8(ptr, val) interlocked_or_fetch_8((char volatile*)(ptr), (char)(val))
+#define atomic_or_fetch_16(ptr, val) interlocked_or_fetch_16((short volatile*)(ptr), (short)(val))
+#define atomic_or_fetch_32(ptr, val) interlocked_or_fetch_32((long volatile*)(ptr), (long)(val))
+#define atomic_or_fetch_64(ptr, val) interlocked_or_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+#ifdef _WIN64
+  #define atomic_or_fetch_ptr atomic_or_fetch_64
+#else
+  #define atomic_or_fetch_ptr atomic_or_fetch_32
+#endif
+
+#define atomic_fetch_or_8(ptr, val) _InterlockedOr8((char volatile*)(ptr), (char)(val))
+#define atomic_fetch_or_16(ptr, val) _InterlockedOr16((short volatile*)(ptr), (short)(val))
+#define atomic_fetch_or_32(ptr, val) _InterlockedOr((long volatile*)(ptr), (long)(val))
+
+#ifdef _M_IX86
+  __int64 interlocked_fetch_or_64(__int64 volatile* ptr, __int64 val);
+  #define atomic_fetch_or_64(ptr, val) interlocked_fetch_or_64((__int64 volatile*)(ptr), (__int64)(val))
+#else
+  #define atomic_fetch_or_64(ptr, val) _InterlockedOr64((__int64 volatile*)(ptr), (__int64)(val))
+#endif
+
+#ifdef _WIN64
+  #define atomic_fetch_or_ptr atomic_fetch_or_64
+#else
+  #define atomic_fetch_or_ptr atomic_fetch_or_32
+#endif
+
+char interlocked_xor_fetch_8(char volatile* ptr, char val);
+short interlocked_xor_fetch_16(short volatile* ptr, short val);
+long interlocked_xor_fetch_32(long volatile* ptr, long val);
+__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val);
+
+#define atomic_xor_fetch_8(ptr, val) interlocked_xor_fetch_8((char volatile*)(ptr), (char)(val))
+#define atomic_xor_fetch_16(ptr, val) interlocked_xor_fetch_16((short volatile*)(ptr), (short)(val))
+#define atomic_xor_fetch_32(ptr, val) interlocked_xor_fetch_32((long volatile*)(ptr), (long)(val))
+#define atomic_xor_fetch_64(ptr, val) interlocked_xor_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
 #ifdef _WIN64
-  #define __sync_add_and_fetch_ptr __sync_add_and_fetch_64
+  #define atomic_xor_fetch_ptr atomic_xor_fetch_64
 #else
-  #define __sync_add_and_fetch_ptr __sync_add_and_fetch_32
+  #define atomic_xor_fetch_ptr atomic_xor_fetch_32
 #endif
 
-#define __sync_sub_and_fetch_8(ptr, val) __sync_add_and_fetch_8((ptr), -(val))
-#define __sync_sub_and_fetch_16(ptr, val) __sync_add_and_fetch_16((ptr), -(val))
-#define __sync_sub_and_fetch_32(ptr, val) __sync_add_and_fetch_32((ptr), -(val))
-#define __sync_sub_and_fetch_64(ptr, val) __sync_add_and_fetch_64((ptr), -(val))
-#define __sync_sub_and_fetch_ptr(ptr, val) __sync_add_and_fetch_ptr((ptr), -(val))
+#define atomic_fetch_xor_8(ptr, val) _InterlockedXor8((char volatile*)(ptr), (char)(val))
+#define atomic_fetch_xor_16(ptr, val) _InterlockedXor16((short volatile*)(ptr), (short)(val))
+#define atomic_fetch_xor_32(ptr, val) _InterlockedXor((long volatile*)(ptr), (long)(val))
 
-int32_t __sync_val_load_32(int32_t *ptr);
-void __sync_val_restore_32(int32_t *ptr, int32_t newval);
+#ifdef _M_IX86
+  __int64 interlocked_fetch_xor_64(__int64 volatile* ptr, __int64 val);
+  #define atomic_fetch_xor_64(ptr, val) interlocked_fetch_xor_64((__int64 volatile*)(ptr), (__int64)(val))
+#else
+  #define atomic_fetch_xor_64(ptr, val) _InterlockedXor64((__int64 volatile*)(ptr), (__int64)(val))
+#endif
+
+#ifdef _WIN64
+  #define atomic_fetch_xor_ptr atomic_fetch_xor_64
+#else
+  #define atomic_fetch_xor_ptr atomic_fetch_xor_32
+#endif
 
 #define SWAP(a, b, c)      \
   do {                     \
diff --git a/src/os/windows/src/twindows.c b/src/os/windows/src/twindows.c
index 106cb903b170a4798af6ad715ecb62f9093ba550..6c10ced6a2c2030c732f6d44606ba64f6ec83167 100644
--- a/src/os/windows/src/twindows.c
+++ b/src/os/windows/src/twindows.c
@@ -66,31 +66,143 @@ int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optle
   return setsockopt(socketfd, level, optname, optval, optlen);
 }
 
-
-char interlocked_add_8(char volatile* ptr, char val) {
+// add
+char interlocked_add_fetch_8(char volatile* ptr, char val) {
   return _InterlockedExchangeAdd8(ptr, val) + val;
 }
 
-short interlocked_add_16(short volatile* ptr, short val) {
+short interlocked_add_fetch_16(short volatile* ptr, short val) {
   return _InterlockedExchangeAdd16(ptr, val) + val;
 }
 
-long interlocked_add_32(long volatile* ptr, long val) {
+long interlocked_add_fetch_32(long volatile* ptr, long val) {
   return _InterlockedExchangeAdd(ptr, val) + val;
 }
 
-__int64 interlocked_add_64(__int64 volatile* ptr, __int64 val) {
+__int64 interlocked_add_fetch_64(__int64 volatile* ptr, __int64 val) {
   return _InterlockedExchangeAdd64(ptr, val) + val;
 }
 
-int32_t __sync_val_load_32(int32_t *ptr) {
-  return InterlockedOr(ptr, 0);
+// and
+char interlocked_and_fetch_8(char volatile* ptr, char val) {
+  return _InterlockedAnd8(ptr, val) & val;
+}
+
+short interlocked_and_fetch_16(short volatile* ptr, short val) {
+  return _InterlockedAnd16(ptr, val) & val;
+}
+
+long interlocked_and_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedAnd(ptr, val) & val;
+}
+
+#ifndef _M_IX86
+
+__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val) {
+  return _InterlockedAnd64(ptr, val) & val;
+}
+
+#else
+
+__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val) {
+  __int64 old, res;
+  do {
+    old = *ptr;
+    res = old & val;
+  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
+  return res;
+}
+
+__int64 interlocked_fetch_and_64(__int64 volatile* ptr, __int64 val) {
+  __int64 old;
+  do {
+    old = *ptr;
+  } while(_InterlockedCompareExchange64(ptr, old & val, old) != old);
+  return old;
+}
+
+#endif
+
+// or
+char interlocked_or_fetch_8(char volatile* ptr, char val) {
+  return _InterlockedOr8(ptr, val) | val;
+}
+
+short interlocked_or_fetch_16(short volatile* ptr, short val) {
+  return _InterlockedOr16(ptr, val) | val;
+}
+
+long interlocked_or_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedOr(ptr, val) | val;
+}
+
+#ifndef _M_IX86
+
+__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val) {
+  return _InterlockedOr64(ptr, val) & val;
+}
+
+#else
+
+__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val) {
+  __int64 old, res;
+  do {
+    old = *ptr;
+    res = old | val;
+  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
+  return res;
+}
+
+__int64 interlocked_fetch_or_64(__int64 volatile* ptr, __int64 val) {
+  __int64 old;
+  do {
+    old = *ptr;
+  } while(_InterlockedCompareExchange64(ptr, old | val, old) != old);
+  return old;
+}
+
+#endif
+
+// xor
+char interlocked_xor_fetch_8(char volatile* ptr, char val) {
+  return _InterlockedXor8(ptr, val) ^ val;
+}
+
+short interlocked_xor_fetch_16(short volatile* ptr, short val) {
+  return _InterlockedXor16(ptr, val) ^ val;
+}
+
+long interlocked_xor_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedXor(ptr, val) ^ val;
+}
+
+#ifndef _M_IX86
+
+__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val) {
+  return _InterlockedXor64(ptr, val) ^ val;
 }
 
-void __sync_val_restore_32(int32_t *ptr, int32_t newval) {
-  InterlockedCompareExchange(ptr, *ptr, newval);
+#else
+
+__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val) {
+  __int64 old, res;
+  do {
+    old = *ptr;
+    res = old ^ val;
+  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
+  return res;
+}
+
+__int64 interlocked_fetch_xor_64(__int64 volatile* ptr, __int64 val) {
+  __int64 old;
+  do {
+    old = *ptr;
+  } while(_InterlockedCompareExchange64(ptr, old ^ val, old) != old);
+  return old;
 }
 
+#endif
+
 void tsPrintOsInfo() {}
 
 char *taosCharsetReplace(char *charsetstr) {
diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 6f92154e9ef6d6dfa444eacfa687763c13f1b7e9..41c628e169be5413b0021622a0e857ca5dc03bf4 100644
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -164,8 +164,8 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
   pHeader->spi = 0;
   pHeader->tcp = 0;
   pHeader->encrypt = 0;
-  pHeader->tranId = __sync_add_and_fetch_32(&pConn->tranId, 1);
-  if (pHeader->tranId == 0) pHeader->tranId = __sync_add_and_fetch_32(&pConn->tranId, 1);
+  pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
+  if (pHeader->tranId == 0) pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
 
   pHeader->sourceId = pConn->ownId;
   pHeader->destId = pConn->peerId;
@@ -196,8 +196,8 @@ char *taosBuildReqMsgWithSize(void *param, char type, int size) {
   pHeader->spi = 0;
   pHeader->tcp = 0;
   pHeader->encrypt = 0;
-  pHeader->tranId = __sync_add_and_fetch_32(&pConn->tranId, 1);
-  if (pHeader->tranId == 0) pHeader->tranId = __sync_add_and_fetch_32(&pConn->tranId, 1);
+  pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
+  if (pHeader->tranId == 0) pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
 
   pHeader->sourceId = pConn->ownId;
   pHeader->destId = pConn->peerId;
diff --git a/src/system/detail/inc/vnode.h b/src/system/detail/inc/vnode.h
index 4d2ebdfa354295d9206bcf395bb35f64a510d798..373d9e713bfa50543770ce25094a0b0a9cec3dab 100644
--- a/src/system/detail/inc/vnode.h
+++ b/src/system/detail/inc/vnode.h
@@ -218,15 +218,15 @@ typedef struct {
  * Only the QInfo.signature == QInfo, this structure can be released safely.
  */
 #define TSDB_QINFO_QUERY_FLAG 0x1
-#define TSDB_QINFO_RESET_SIG(x) ((x)->signature = (uint64_t)(x))
+#define TSDB_QINFO_RESET_SIG(x) atomic_store_64(&((x)->signature), (uint64_t)(x))
 #define TSDB_QINFO_SET_QUERY_FLAG(x) \
-  __sync_val_compare_and_swap(&((x)->signature), (uint64_t)(x), TSDB_QINFO_QUERY_FLAG);
+  atomic_val_compare_exchange_64(&((x)->signature), (uint64_t)(x), TSDB_QINFO_QUERY_FLAG);
 
 // live lock: wait for query reaching a safe-point, release all resources
 // belongs to this query
 #define TSDB_WAIT_TO_SAFE_DROP_QINFO(x)                                                       \
   {                                                                                           \
-    while (__sync_val_compare_and_swap(&((x)->signature), (x), 0) == TSDB_QINFO_QUERY_FLAG) { \
+    while (atomic_val_compare_exchange_64(&((x)->signature), (x), 0) == TSDB_QINFO_QUERY_FLAG) { \
       taosMsleep(1);                                                                          \
     }                                                                                         \
   }
diff --git a/src/system/detail/src/dnodeSystem.c b/src/system/detail/src/dnodeSystem.c
index a0fdf95fc8f9fdafb729f271017fbf510ec2db39..30b3e202ad4fa0fb8c723a872cd5c7ab0b21aa7a 100644
--- a/src/system/detail/src/dnodeSystem.c
+++ b/src/system/detail/src/dnodeSystem.c
@@ -216,8 +216,8 @@ void dnodeResetSystem() {
 
 void dnodeCountRequest(SCountInfo *info) {
   httpGetReqCount(&info->httpReqNum);
-  info->selectReqNum = __sync_fetch_and_and(&vnodeSelectReqNum, 0);
-  info->insertReqNum = __sync_fetch_and_and(&vnodeInsertReqNum, 0);
+  info->selectReqNum = atomic_exchange_32(&vnodeSelectReqNum, 0);
+  info->insertReqNum = atomic_exchange_32(&vnodeInsertReqNum, 0);
 }
 
 #pragma GCC diagnostic pop
\ No newline at end of file
diff --git a/src/system/detail/src/mgmtShell.c b/src/system/detail/src/mgmtShell.c
index 43b002992df2f12ce982e88d8a8822aaab04e70a..11a85086d9276db4df2a156531de7a2fdc301e80 100644
--- a/src/system/detail/src/mgmtShell.c
+++ b/src/system/detail/src/mgmtShell.c
@@ -922,8 +922,8 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
   taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
 
   if (rowsToRead == 0) {
-    int64_t oldSign = __sync_val_compare_and_swap(&pShow->signature, (uint64_t)pShow, 0);
-    if (oldSign != (uint64_t)pShow) {
+    uintptr_t oldSign = atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
+    if (oldSign != (uintptr_t)pShow) {
       return msgLen;
     }
     // pShow->signature = 0;
@@ -1093,8 +1093,8 @@ int mgmtProcessHeartBeatMsg(char *cont, int contLen, SConnObj *pConn) {
 }
 
 void mgmtEstablishConn(SConnObj *pConn) {
-  __sync_fetch_and_add(&mgmtShellConns, 1);
-  __sync_fetch_and_add(&sdbExtConns, 1);
+  atomic_fetch_add_32(&mgmtShellConns, 1);
+  atomic_fetch_add_32(&sdbExtConns, 1);
   pConn->stime = taosGetTimestampMs();
 
   if (strcmp(pConn->pUser->user, "root") == 0 || strcmp(pConn->pUser->user, pConn->pAcct->user) == 0) {
@@ -1168,8 +1168,8 @@ int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) {
 
   if (pConn->pAcct) {
     mgmtRemoveConnFromAcct(pConn);
-    __sync_fetch_and_sub(&mgmtShellConns, 1);
-    __sync_fetch_and_sub(&sdbExtConns, 1);
+    atomic_fetch_sub_32(&mgmtShellConns, 1);
+    atomic_fetch_sub_32(&sdbExtConns, 1);
   }
 
   code = 0;
@@ -1227,8 +1227,8 @@ void *mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle) {
   if (msg == NULL) {
     if (pConn) {
       mgmtRemoveConnFromAcct(pConn);
-      __sync_fetch_and_sub(&mgmtShellConns, 1);
-      __sync_fetch_and_sub(&sdbExtConns, 1);
+      atomic_fetch_sub_32(&mgmtShellConns, 1);
+      atomic_fetch_sub_32(&sdbExtConns, 1);
       mTrace("connection from %s is closed", pConn->pUser->user);
       memset(pConn, 0, sizeof(SConnObj));
     }
diff --git a/src/system/detail/src/vnodeCache.c b/src/system/detail/src/vnodeCache.c
index 8b51bc460923fa5dee6bad1c4d75e91789d59cec..f4bea682e93c951d7bc7d7fd9b581b4033eac471 100644
--- a/src/system/detail/src/vnodeCache.c
+++ b/src/system/detail/src/vnodeCache.c
@@ -256,7 +256,7 @@ void vnodeUpdateCommitInfo(SMeterObj *pObj, int slot, int pos, uint64_t count) {
     tslot = (tslot + 1) % pInfo->maxBlocks;
   }
 
-  __sync_fetch_and_add(&pObj->freePoints, pObj->pointsPerBlock * slots);
+  atomic_fetch_add_32(&pObj->freePoints, pObj->pointsPerBlock * slots);
   pInfo->commitSlot = slot;
   pInfo->commitPoint = pos;
   pObj->commitCount = count;
@@ -505,7 +505,7 @@ int vnodeInsertPointToCache(SMeterObj *pObj, char *pData) {
     pData += pObj->schema[col].bytes;
   }
 
-  __sync_fetch_and_sub(&pObj->freePoints, 1);
+  atomic_fetch_sub_32(&pObj->freePoints, 1);
   pCacheBlock->numOfPoints++;
   pPool->count++;
 
@@ -1114,7 +1114,7 @@ int vnodeSyncRestoreCache(int vnode, int fd) {
       for (int col = 0; col < pObj->numOfColumns; ++col)
         if (taosReadMsg(fd, pBlock->offset[col], pObj->schema[col].bytes * points) <= 0) return -1;
 
-      __sync_fetch_and_sub(&pObj->freePoints, points);
+      atomic_fetch_sub_32(&pObj->freePoints, points);
       blocksReceived++;
       pointsReceived += points;
       pObj->lastKey = *((TSKEY *)(pBlock->offset[0] + pObj->schema[0].bytes * (points - 1)));
diff --git a/src/system/detail/src/vnodeFile.c b/src/system/detail/src/vnodeFile.c
index df94c883ace04237577bb905fe0b2b758fd7f2ab..fdafc01352cb223a0ef31d254f13a852b7502544 100644
--- a/src/system/detail/src/vnodeFile.c
+++ b/src/system/detail/src/vnodeFile.c
@@ -410,7 +410,7 @@ void vnodeRemoveFile(int vnode, int fileId) {
   int fd = open(headName, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
   if (fd > 0) {
     vnodeGetHeadFileHeaderInfo(fd, &headInfo);
-    __sync_fetch_and_add(&(pVnode->vnodeStatistic.totalStorage), -headInfo.totalStorage);
+    atomic_fetch_add_64(&(pVnode->vnodeStatistic.totalStorage), -headInfo.totalStorage);
     close(fd);
   }
 
diff --git a/src/system/detail/src/vnodeImport.c b/src/system/detail/src/vnodeImport.c
index f50b6f49461def53da870f448e6d4aabd213ed95..ed9c319216eb8c3cd3e544fbaf14a7fd9cfaf8ee 100644
--- a/src/system/detail/src/vnodeImport.c
+++ b/src/system/detail/src/vnodeImport.c
@@ -497,7 +497,7 @@ int vnodeImportToFile(SImportInfo *pImport) {
         pInfo->commitPoint = 0;
         pCacheBlock->numOfPoints = points;
         if (slot == pInfo->currentSlot) {
-          __sync_fetch_and_add(&pObj->freePoints, pInfo->commitPoint);
+          atomic_fetch_add_32(&pObj->freePoints, pInfo->commitPoint);
         }
       } else {
         // if last block is full and committed
@@ -625,7 +625,7 @@ int vnodeImportToCache(SImportInfo *pImport, char *payload, int rows) {
   }
 
   code = 0;
-  __sync_fetch_and_sub(&pObj->freePoints, rows);
+  atomic_fetch_sub_32(&pObj->freePoints, rows);
   dTrace("vid:%d sid:%d id:%s, %d rows data are imported to cache", pObj->vnode, pObj->sid, pObj->meterId, rows);
 
 _exit:
diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c
index a595e8f689786857d255680cb19e6f3e2dc5c4fd..c001daf7da711b4313a41b5b8ce245f69a728987 100644
--- a/src/system/detail/src/vnodeMeter.c
+++ b/src/system/detail/src/vnodeMeter.c
@@ -643,8 +643,8 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
     pData += pObj->bytesPerPoint;
     points++;
   }
-  __sync_fetch_and_add(&(pVnode->vnodeStatistic.pointsWritten), points * (pObj->numOfColumns - 1));
-  __sync_fetch_and_add(&(pVnode->vnodeStatistic.totalStorage), points * pObj->bytesPerPoint);
+  atomic_fetch_add_64(&(pVnode->vnodeStatistic.pointsWritten), points * (pObj->numOfColumns - 1));
+  atomic_fetch_add_64(&(pVnode->vnodeStatistic.totalStorage), points * pObj->bytesPerPoint);
 
   pthread_mutex_lock(&(pVnode->vmutex));
 
diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c
index 654f9537e4d8a8ec7b3ff2d0ce278ecd3cd38273..9967094a2680d55259c9e00c1accb2ec87796196 100644
--- a/src/system/detail/src/vnodeQueryImpl.c
+++ b/src/system/detail/src/vnodeQueryImpl.c
@@ -3890,14 +3890,14 @@ void vnodeDecMeterRefcnt(SQInfo *pQInfo) {
   SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
 
   if (pSupporter == NULL || pSupporter->numOfMeters == 1) {
-    __sync_fetch_and_sub(&pQInfo->pObj->numOfQueries, 1);
+    atomic_fetch_sub_32(&pQInfo->pObj->numOfQueries, 1);
     dTrace("QInfo:%p vid:%d sid:%d meterId:%s, query is over, numOfQueries:%d", pQInfo, pQInfo->pObj->vnode,
            pQInfo->pObj->sid, pQInfo->pObj->meterId, pQInfo->pObj->numOfQueries);
   } else {
     int32_t num = 0;
     for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
       SMeterObj *pMeter = getMeterObj(pSupporter->pMeterObj, pSupporter->pSidSet->pSids[i]->sid);
-      __sync_fetch_and_sub(&(pMeter->numOfQueries), 1);
+      atomic_fetch_sub_32(&(pMeter->numOfQueries), 1);
 
       if (pMeter->numOfQueries > 0) {
         dTrace("QInfo:%p vid:%d sid:%d meterId:%s, query is over, numOfQueries:%d", pQInfo, pMeter->vnode, pMeter->sid,
diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c
index bbe2f60274c5e17a884b842322cd9e6ca4f756df..1b4b43f5a28fcbcbe5cbae1752d7d0069d686d89 100644
--- a/src/system/detail/src/vnodeShell.c
+++ b/src/system/detail/src/vnodeShell.c
@@ -365,7 +365,7 @@ _query_over:
     vnodeFreeColumnInfo(&pQueryMsg->colList[i]);
   }
 
-  __sync_fetch_and_add(&vnodeSelectReqNum, 1);
+  atomic_fetch_add_32(&vnodeSelectReqNum, 1);
   return ret;
 }
 
@@ -599,6 +599,6 @@ _submit_over:
   // for import, send the submit response only when return code is not zero
   if (pSubmit->import == 0 || code != 0) ret = vnodeSendShellSubmitRspMsg(pObj, code, numOfTotalPoints);
 
-  __sync_fetch_and_add(&vnodeInsertReqNum, 1);
+  atomic_fetch_add_32(&vnodeInsertReqNum, 1);
   return ret;
 }
diff --git a/src/system/detail/src/vnodeStore.c b/src/system/detail/src/vnodeStore.c
index e00b4de7bc42d611b5fd7fe0f2d2652117e41f4f..e4294d72c692472016e3e7c66da7009dc932bfb8 100644
--- a/src/system/detail/src/vnodeStore.c
+++ b/src/system/detail/src/vnodeStore.c
@@ -351,7 +351,7 @@ void vnodeCalcOpenVnodes() {
     openVnodes++;
   }
 
-  __sync_val_compare_and_swap(&tsOpenVnodes, tsOpenVnodes, openVnodes);
+  atomic_store_32(&tsOpenVnodes, openVnodes);
 }
 
 void vnodeUpdateHeadFile(int vnode, int oldTables, int newTables) {
diff --git a/src/system/detail/src/vnodeUtil.c b/src/system/detail/src/vnodeUtil.c
index 7a2fb5530cef467e7dc52fa3d2d92069d890a9b8..b097b4706c9ff7dc910a8720c4859060472309e6 100644
--- a/src/system/detail/src/vnodeUtil.c
+++ b/src/system/detail/src/vnodeUtil.c
@@ -567,7 +567,7 @@ int32_t vnodeIncQueryRefCount(SQueryMeterMsg* pQueryMsg, SMeterSidExtInfo** pSid
        * check if the numOfQueries is 0 or not.
        */
       pMeterObjList[(*numOfInc)++] = pMeter;
-      __sync_fetch_and_add(&pMeter->numOfQueries, 1);
+      atomic_fetch_add_32(&pMeter->numOfQueries, 1);
 
       // output for meter more than one query executed
       if (pMeter->numOfQueries > 1) {
@@ -591,7 +591,7 @@ void vnodeDecQueryRefCount(SQueryMeterMsg* pQueryMsg, SMeterObj** pMeterObjList,
     SMeterObj* pMeter = pMeterObjList[i];
 
     if (pMeter != NULL) {  // here, do not need to lock to perform operations
-      __sync_fetch_and_sub(&pMeter->numOfQueries, 1);
+      atomic_fetch_sub_32(&pMeter->numOfQueries, 1);
 
       if (pMeter->numOfQueries > 0) {
         dTrace("qmsg:%p, vid:%d sid:%d id:%s dec query ref, numOfQueries:%d", pQueryMsg, pMeter->vnode, pMeter->sid,
@@ -646,7 +646,7 @@ void vnodeUpdateQueryColumnIndex(SQuery* pQuery, SMeterObj* pMeterObj) {
 }
 
 int32_t vnodeSetMeterState(SMeterObj* pMeterObj, int32_t state) {
-  return __sync_val_compare_and_swap(&pMeterObj->state, TSDB_METER_STATE_READY, state);
+  return atomic_val_compare_exchange_32(&pMeterObj->state, TSDB_METER_STATE_READY, state);
 }
 
 void vnodeClearMeterState(SMeterObj* pMeterObj, int32_t state) {
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 7804cb0d0e8d6813f77918df5bc3dbe7d6047acf..e92ac5d46d9f81a680feeba07ae39558dbb74b90 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -516,7 +516,7 @@ static SDataNode *taosUpdateCacheImpl(SCacheObj *pObj, SDataNode *pNode, char *k
     pNewNode->addTime = taosGetTimestampMs();
     pNewNode->time = pNewNode->addTime + keepTime;
 
-    __sync_add_and_fetch_32(&pNewNode->refCount, 1);
+    atomic_add_fetch_32(&pNewNode->refCount, 1);
 
     // the address of this node may be changed, so the prev and next element should update the corresponding pointer
     taosUpdateInHashTable(pObj, pNewNode);
@@ -529,7 +529,7 @@ static SDataNode *taosUpdateCacheImpl(SCacheObj *pObj, SDataNode *pNode, char *k
       return NULL;
     }
 
-    __sync_add_and_fetch_32(&pNewNode->refCount, 1);
+    atomic_add_fetch_32(&pNewNode->refCount, 1);
 
     assert(hashVal == (*pObj->hashFp)(key, keyLen - 1));
     pNewNode->hashVal = hashVal;
@@ -558,7 +558,7 @@ static FORCE_INLINE SDataNode *taosAddToCacheImpl(SCacheObj *pObj, char *key, ui
     return NULL;
   }
 
-  __sync_add_and_fetch_32(&pNode->refCount, 1);
+  atomic_add_fetch_32(&pNode->refCount, 1);
   pNode->hashVal = (*pObj->hashFp)(key, keyLen - 1);
   taosAddNodeToHashTable(pObj, pNode);
 
@@ -616,7 +616,7 @@ static FORCE_INLINE void taosDecRef(SDataNode *pNode) {
   }
 
   if (pNode->refCount > 0) {
-    __sync_sub_and_fetch_32(&pNode->refCount, 1);
+    atomic_sub_fetch_32(&pNode->refCount, 1);
     pTrace("key:%s is released by app.refcnt:%d", pNode->key, pNode->refCount);
   } else {
     /*
@@ -676,20 +676,20 @@ void *taosGetDataFromCache(void *handle, char *key) {
 
   SDataNode *ptNode = taosGetNodeFromHashTable(handle, key, keyLen);
   if (ptNode != NULL) {
-    __sync_add_and_fetch_32(&ptNode->refCount, 1);
+    atomic_add_fetch_32(&ptNode->refCount, 1);
   }
 
   __cache_unlock(pObj);
 
   if (ptNode != NULL) {
-    __sync_add_and_fetch_32(&pObj->statistics.hitCount, 1);
+    atomic_add_fetch_32(&pObj->statistics.hitCount, 1);
     pTrace("key:%s is retrieved from cache,refcnt:%d", key, ptNode->refCount);
   } else {
-    __sync_add_and_fetch_32(&pObj->statistics.missCount, 1);
+    atomic_add_fetch_32(&pObj->statistics.missCount, 1);
     pTrace("key:%s not in cache,retrieved failed", key);
   }
 
-  __sync_add_and_fetch_32(&pObj->statistics.totalAccess, 1);
+  atomic_add_fetch_32(&pObj->statistics.totalAccess, 1);
   return (ptNode != NULL) ? ptNode->data : NULL;
 }
 
diff --git a/src/util/src/textbuffer.c b/src/util/src/textbuffer.c
index c6b56919e9707d336319f5815f12de042db1961d..ebb6b9e0b8ca302210654f61280835bdff3b0d11 100644
--- a/src/util/src/textbuffer.c
+++ b/src/util/src/textbuffer.c
@@ -60,7 +60,7 @@ void getTmpfilePath(const char *fileNamePrefix, char *dstPath) {
   strcat(tmpPath, fileNamePrefix);
   strcat(tmpPath, "-%u-%u");
 
-  snprintf(dstPath, MAX_TMPFILE_PATH_LENGTH, tmpPath, taosGetPthreadId(), __sync_add_and_fetch_32(&tmpFileSerialNum, 1));
+  snprintf(dstPath, MAX_TMPFILE_PATH_LENGTH, tmpPath, taosGetPthreadId(), atomic_add_fetch_32(&tmpFileSerialNum, 1));
 }
 
 /*
diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c
index 02e30be33a7babde369f5d3b6c8ab8ef71d1fba6..b88cb7dc170435e2b8f4e086413ac29fd6474dbc 100644
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
@@ -381,7 +381,7 @@ void tprintf(const char *const flags, int dflag, const char *const format, ...)
     }
 
     if (taosLogMaxLines > 0) {
-      __sync_add_and_fetch_32(&taosLogLines, 1);
+      atomic_add_fetch_32(&taosLogLines, 1);
 
       if ((taosLogLines > taosLogMaxLines) && (openInProgress == 0)) taosOpenNewLogFile();
     }
@@ -458,7 +458,7 @@ void taosPrintLongString(const char *const flags, int dflag, const char *const f
     taosPushLogBuffer(logHandle, buffer, len);
 
     if (taosLogMaxLines > 0) {
-      __sync_add_and_fetch_32(&taosLogLines, 1);
+      atomic_add_fetch_32(&taosLogLines, 1);
 
       if ((taosLogLines > taosLogMaxLines) && (openInProgress == 0)) taosOpenNewLogFile();
     }
diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index 97e218915330d838f18f5da3a8346cf4c2b27890..cf09aaee5e937f8a3c833290b2e4069e1f2b58f8 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -105,15 +105,15 @@ static timer_map_t timerMap;
 static uintptr_t getNextTimerId() {
   uintptr_t id;
   do {
-    id = __sync_add_and_fetch_ptr(&nextTimerId, 1);
+    id = atomic_add_fetch_ptr(&nextTimerId, 1);
   } while (id == 0);
   return id;
 }
 
-static void timerAddRef(tmr_obj_t* timer) { __sync_add_and_fetch_8(&timer->refCount, 1); }
+static void timerAddRef(tmr_obj_t* timer) { atomic_add_fetch_8(&timer->refCount, 1); }
 
 static void timerDecRef(tmr_obj_t* timer) {
-  if (__sync_sub_and_fetch_8(&timer->refCount, 1) == 0) {
+  if (atomic_sub_fetch_8(&timer->refCount, 1) == 0) {
     free(timer);
   }
 }
@@ -121,7 +121,7 @@ static void timerDecRef(tmr_obj_t* timer) {
 static void lockTimerList(timer_list_t* list) {
   int64_t tid = taosGetPthreadId();
   int       i = 0;
-  while (__sync_val_compare_and_swap_64(&(list->lockedBy), 0, tid) != 0) {
+  while (atomic_val_compare_exchange_64(&(list->lockedBy), 0, tid) != 0) {
     if (++i % 1000 == 0) {
       sched_yield();
     }
@@ -130,7 +130,7 @@ static void lockTimerList(timer_list_t* list) {
 
 static void unlockTimerList(timer_list_t* list) {
   int64_t tid = taosGetPthreadId();
-  if (__sync_val_compare_and_swap_64(&(list->lockedBy), tid, 0) != tid) {
+  if (atomic_val_compare_exchange_64(&(list->lockedBy), tid, 0) != tid) {
     assert(false);
     tmrError("%d trying to unlock a timer list not locked by current thread.", tid);
   }
@@ -257,7 +257,7 @@ static bool removeFromWheel(tmr_obj_t* timer) {
 static void processExpiredTimer(void* handle, void* arg) {
   tmr_obj_t* timer = (tmr_obj_t*)handle;
   timer->executedBy = taosGetPthreadId();
-  uint8_t state = __sync_val_compare_and_swap_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_EXPIRED);
+  uint8_t state = atomic_val_compare_exchange_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_EXPIRED);
   if (state == TIMER_STATE_WAITING) {
     const char* fmt = "%s timer[id=%lld, fp=%p, param=%p] execution start.";
     tmrTrace(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
@@ -431,7 +431,7 @@ bool taosTmrStop(tmr_h timerId) {
     return false;
   }
 
-  uint8_t state = __sync_val_compare_and_swap_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_CANCELED);
+  uint8_t state = atomic_val_compare_exchange_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_CANCELED);
   doStopTimer(timer, state);
   timerDecRef(timer);
 
@@ -456,7 +456,7 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
   if (timer == NULL) {
     tmrTrace("%s timer[id=%lld] does not exist", ctrl->label, id);
   } else {
-    uint8_t state = __sync_val_compare_and_swap_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_CANCELED);
+    uint8_t state = atomic_val_compare_exchange_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_CANCELED);
     if (!doStopTimer(timer, state)) {
       timerDecRef(timer);
       timer = NULL;