Commit b9099963 authored by jperaldi's avatar jperaldi

Moving to ACP version 1.1.30 for delivery to come

parent 285925ac
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
#pragma once #pragma once
#define ACP_VERSION "1.1.29" #define ACP_VERSION "1.1.30"
#define ACP_VERSION_CKSM "2aeae23993ec5f4b53cf4a40c313aec9" #define ACP_VERSION_CKSM "fe1196c636726d0acaedfd8a3158d63c"
...@@ -247,8 +247,7 @@ int acpRecvMsg(acpCtx_t ctx, size_t* size, unsigned char* buffer) ...@@ -247,8 +247,7 @@ int acpRecvMsg(acpCtx_t ctx, size_t* size, unsigned char* buffer)
return -ACP_ERR_SOCK_ERROR; return -ACP_ERR_SOCK_ERROR;
} }
// TODO commented this log until final fix ACP_DEBUG_TRACE_CLOG(ctx, "Data on socket(s)");
//ACP_DEBUG_TRACE_CLOG(ctx, "Data on socket(s)");
if (ACP_CTX_CAST(ctx)->isServer && ACP_CTX_CAST(ctx)->sock == sock) { if (ACP_CTX_CAST(ctx)->isServer && ACP_CTX_CAST(ctx)->sock == sock) {
int peerSock = acpSocketAccept(sock); int peerSock = acpSocketAccept(sock);
......
...@@ -91,6 +91,9 @@ SIDL_BEGIN_C_INTERFACE ...@@ -91,6 +91,9 @@ SIDL_BEGIN_C_INTERFACE
/** Default size for log buffer. */ /** Default size for log buffer. */
#define ADBG_DEFAULT_LOG_BUFFER_SIZE (1 * 1024 * 1024) // 1MB #define ADBG_DEFAULT_LOG_BUFFER_SIZE (1 * 1024 * 1024) // 1MB
/** Set null logger to disable adbg logs */
#define ADBG_NULL_LOGGER ((adbgLogger_t)-1)
/** Default global logger (printf). */ /** Default global logger (printf). */
void adbgDefaultGlobalLogger(const char* fmt, ...); void adbgDefaultGlobalLogger(const char* fmt, ...);
......
...@@ -73,16 +73,14 @@ void adbgSetLogger(acpCtx_t ctx, adbgLogger_t logger, size_t size) ...@@ -73,16 +73,14 @@ void adbgSetLogger(acpCtx_t ctx, adbgLogger_t logger, size_t size)
} }
if (logger) { if (logger) {
if (ACP_CTX_CAST(ctx)->logger) {
SIDL_ASSERT(!ACP_CTX_CAST(ctx)->logger);
}
ACP_CTX_CAST(ctx)->logger = logger; ACP_CTX_CAST(ctx)->logger = logger;
} }
if (size) { if (size) {
if (ACP_CTX_CAST(ctx)->logBuf) { if (ACP_CTX_CAST(ctx)->logBuf) {
SIDL_ASSERT(!ACP_CTX_CAST(ctx)->logBuf); acpFree(ACP_CTX_CAST(ctx)->logBuf);
} }
ACP_CTX_CAST(ctx)->logBuf = (unsigned char*)acpMalloc(size); ACP_CTX_CAST(ctx)->logBuf = (unsigned char*)acpMalloc(size);
SIDL_ASSERT(ACP_CTX_CAST(ctx)->logBuf); SIDL_ASSERT(ACP_CTX_CAST(ctx)->logBuf);
ACP_CTX_CAST(ctx)->logBufMaxSize = size; ACP_CTX_CAST(ctx)->logBufMaxSize = size;
...@@ -123,6 +121,10 @@ void adbgPrintLog(acpCtx_t ctx, const char* fmt, ...) ...@@ -123,6 +121,10 @@ void adbgPrintLog(acpCtx_t ctx, const char* fmt, ...)
return; return;
} }
if (ACP_CTX_CAST(ctx)->logger == ADBG_NULL_LOGGER) {
return;
}
adbgCheckAndSetLogger(ctx); adbgCheckAndSetLogger(ctx);
if (fmt) { if (fmt) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment