improve(lcm_log): add LCM_LOG_WHITELIST, LCM_LOG_BLACKLIST, LCM_LOG_O…

…UTFILE

src/1sided.c

@@ -125,7 +125,7 @@ LCI_error_t LCI_putla(LCI_endpoint_t ep, LCI_lbuffer_t buffer,
   packet->data.rts.send_ctx = (uintptr_t) rdv_ctx;
   packet->data.rts.size = buffer.length;
 
-  LCM_DBG_Log(LCM_LOG_DEBUG, "send rts: type %d sctx %p size %lu\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "send rts: type %d sctx %p size %lu\n",
               packet->data.rts.msg_type, (void*) packet->data.rts.send_ctx,
               packet->data.rts.size);
   LCI_error_t ret = lc_server_send(ep->device->server, rank, packet->data.address,
@@ -197,7 +197,7 @@ LCI_error_t LCI_putva(LCI_endpoint_t ep, LCI_iovec_t iovec,
   memcpy((void*) &packet->data.rts.size_p[iovec.count], iovec.piggy_back.address,
          iovec.piggy_back.length);
 
-  LCM_DBG_Log(LCM_LOG_DEBUG, "send rts: type %d sctx %p count %d "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "send rts: type %d sctx %p count %d "
               "piggy_back_size %lu\n", packet->data.rts.msg_type,
               (void*) packet->data.rts.send_ctx, packet->data.rts.count,
               packet->data.rts.piggy_back_size);

src/device.c

@@ -30,17 +30,17 @@ LCI_error_t LCI_device_init(LCI_device_t * device_ptr)
     p->context.poolid = 0;
     lc_pool_put(device->pkpool, p);
   }
-  LCM_DBG_Log(LCM_LOG_DEBUG, "device %p initialized\n", device);
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "device %p initialized\n", device);
   return LCI_OK;
 }
 
 LCI_error_t LCI_device_free(LCI_device_t *device_ptr)
 {
   LCI_device_t device = *device_ptr;
-  LCM_DBG_Log(LCM_LOG_DEBUG, "free device %p\n", device);
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "free device %p\n", device);
   int total_num = lc_pool_count(device->pkpool) + device->recv_posted;
   if (total_num != LCI_SERVER_MAX_PKTS)
-    LCM_DBG_Log(LCM_LOG_WARN, "Potentially losing packets %d != %d\n", total_num, LCI_SERVER_MAX_PKTS);
+    LCM_DBG_Log_default(LCM_LOG_WARN, "Potentially losing packets %d != %d\n", total_num, LCI_SERVER_MAX_PKTS);
   LCII_mt_free(&device->mt);
   LCM_archive_fini(&(device->ctx_archive));
   LCII_bq_fini(&device->bq);
@@ -100,20 +100,20 @@ LCI_error_t LCI_progress(LCI_device_t device)
   for (int i = 0; i < count; i++) {
     if (entry[i].opcode == LCII_OP_RECV) {
       // two-sided recv.
-      LCM_DBG_Log(LCM_LOG_DEBUG, "complete recv: packet %p rank %d length %lu imm_data %u\n",
+      LCM_DBG_Log_default(LCM_LOG_DEBUG, "complete recv: packet %p rank %d length %lu imm_data %u\n",
                   entry[i].ctx, entry[i].rank, entry[i].length, entry[i].imm_data);
       lc_serve_recv((lc_packet*)entry[i].ctx, entry[i].rank, entry[i].length, entry[i].imm_data);
       --device->recv_posted;
     } else if (entry[i].opcode == LCII_OP_RDMA_WRITE) {
-      LCM_DBG_Log(LCM_LOG_DEBUG, "complete write: imm_data %u\n", entry[i].imm_data);
+      LCM_DBG_Log_default(LCM_LOG_DEBUG, "complete write: imm_data %u\n", entry[i].imm_data);
       if (entry[i].ctx != NULL) {
         LCII_free_packet((lc_packet*)entry[i].ctx);
         --device->recv_posted;
       }
       lc_serve_rdma(entry[i].imm_data);
     } else {
       // entry[i].opcode == LCII_OP_SEND
-      LCM_DBG_Log(LCM_LOG_DEBUG, "complete send: address %p\n", (void*) entry[i].ctx);
+      LCM_DBG_Log_default(LCM_LOG_DEBUG, "complete send: address %p\n", (void*) entry[i].ctx);
       if (entry[i].ctx == NULL) continue;
       lc_serve_send((void*)entry[i].ctx);
     }
@@ -128,7 +128,7 @@ LCI_error_t LCI_progress(LCI_device_t device)
     if (packet == NULL) {
       if (device->recv_posted < LCI_SERVER_MAX_RCVS / 2 && !g_server_no_recv_packets) {
         g_server_no_recv_packets = 1;
-        LCM_DBG_Log(LCM_LOG_DEBUG, "WARNING-LC: deadlock alert. There is only "
+        LCM_DBG_Log_default(LCM_LOG_DEBUG, "WARNING-LC: deadlock alert. There is only "
                                    "%d packets left for post_recv\n",
                     device->recv_posted);
       }
@@ -141,7 +141,7 @@ LCI_error_t LCI_progress(LCI_device_t device)
   }
   if (device->recv_posted == LCI_SERVER_MAX_RCVS && g_server_no_recv_packets) {
     g_server_no_recv_packets = 0;
-    LCM_DBG_Log(LCM_LOG_DEBUG, "WARNING-LC: recovered from deadlock alert.\n");
+    LCM_DBG_Log_default(LCM_LOG_DEBUG, "WARNING-LC: recovered from deadlock alert.\n");
   }
 
   return ret;

src/env.c

@@ -43,7 +43,7 @@ void lc_env_init(int num_proc, int rank)
   LCI_PACKET_RETURN_THRESHOLD = getenv_or("LCI_PACKET_RETURN_THRESHOLD", 1024);
   LCI_USE_DREG = getenv_or("LCI_USE_DREG", 0);
   if (LCI_USE_DREG == 1) {
-    LCM_Log(LCM_LOG_WARN, "The registration cache is enabled. The program might "
+    LCM_Log_default(LCM_LOG_WARN, "The registration cache is enabled. The program might "
             "be buggy when the allocation/free is too dynamic\n");
   }
 }

src/include/backlog_queue.h

@@ -42,7 +42,7 @@ static inline void LCII_bq_init(LCII_backlog_queue_t *bq_p) {
 
 static inline void LCII_bq_fini(LCII_backlog_queue_t *bq_p) {
   if (bq_p->length != 0) {
-    LCM_Log(LCM_LOG_WARN, "There are still %d pending entries in the backlog queue\n", bq_p->length);
+    LCM_Log_default(LCM_LOG_WARN, "There are still %d pending entries in the backlog queue\n", bq_p->length);
     LCII_bq_entry_t *p = bq_p->head;
     LCII_bq_entry_t *q;
     while (p != NULL) {
@@ -55,7 +55,7 @@ static inline void LCII_bq_fini(LCII_backlog_queue_t *bq_p) {
     bq_p->tail = NULL;
     LCM_Assert(bq_p->length == 0, "backlog queue is in a incosistent state\n");
   }
-  LCM_Log(LCM_LOG_INFO, "backlog queue's maximum length is %d\n", bq_p->max_length);
+  LCM_Log_default(LCM_LOG_INFO, "backlog queue's maximum length is %d\n", bq_p->max_length);
 }
 
 // this can be called by both the worker threads and progress threads

src/include/lcii_rdv.h

@@ -187,7 +187,7 @@ static inline void LCII_handle_2sided_writeImm(LCI_endpoint_t ep, uint64_t ctx_k
       (LCII_context_t*)LCM_archive_remove(ep->ctx_archive_p, ctx_key);
   LCM_DBG_Assert(ctx->data_type == LCI_LONG,
                  "Didn't get the right context! This might imply some bugs in the LCM_archive_t.\n");
-  LCM_DBG_Log(LCM_LOG_DEBUG, "complete recvl: ctx %p rank %d buf %p size %lu "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "complete recvl: ctx %p rank %d buf %p size %lu "
                              "tag %d user_ctx %p completion attr %x completion %p\n",
               ctx, ctx->rank, ctx->data.lbuffer.address, ctx->data.lbuffer.length,
               ctx->tag, ctx->user_context, ctx->comp_attr, ctx->completion);
@@ -225,7 +225,7 @@ static inline void LCII_handle_1sided_rts(LCI_endpoint_t ep, lc_packet* packet,
       (uintptr_t) rdv_ctx->data.lbuffer.address - packet->data.rtr.remote_addr_base;
   packet->data.rtr.rkey = lc_server_rma_rkey(*(rdv_ctx->data.lbuffer.segment));
 
-  LCM_DBG_Log(LCM_LOG_DEBUG, "send rtr: type %d sctx %p base %p offset %d "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "send rtr: type %d sctx %p base %p offset %d "
               "rkey %lu rctx_key %u\n", packet->data.rtr.msg_type,
               (void*) packet->data.rtr.send_ctx, (void*) packet->data.rtr.remote_addr_base,
               packet->data.rtr.remote_addr_offset, packet->data.rtr.rkey,
@@ -310,7 +310,7 @@ static inline void LCII_handle_iovec_rts(LCI_endpoint_t ep, lc_packet* packet,
         lc_server_rma_rkey(*(rdv_ctx->data.iovec.lbuffers[i].segment));
   }
 
-  LCM_DBG_Log(LCM_LOG_DEBUG, "send rtr: type %d sctx %p count %d rctx %p\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "send rtr: type %d sctx %p count %d rctx %p\n",
               packet->data.rtr.msg_type, (void*) packet->data.rtr.send_ctx,
               rdv_ctx->data.iovec.count, (void*) packet->data.rtr.recv_ctx);
   size_t length = (uintptr_t) &packet->data.rtr.remote_iovecs_p[rdv_ctx->data.iovec.count] - (uintptr_t) packet->data.address;
@@ -365,7 +365,7 @@ static inline void LCII_handle_iovec_put_comp(LCII_extended_context_t *ectx)
       ctx->data.iovec.lbuffers[i].segment = LCI_SEGMENT_ALL;
     }
   }
-  LCM_DBG_Log(LCM_LOG_DEBUG, "send FIN: rctx %p\n", (void*) ectx->recv_ctx);
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "send FIN: rctx %p\n", (void*) ectx->recv_ctx);
   lc_server_sends_bq(ectx->ep->bq_p, ectx->ep->bq_spinlock_p,
                      ectx->ep->device->server, ctx->rank, &ectx->recv_ctx,
                   sizeof(ectx->recv_ctx),
@@ -378,7 +378,7 @@ static inline void LCII_handle_iovec_recv_FIN(lc_packet* packet)
 {
   LCII_context_t *ctx;
   memcpy(&ctx, packet->data.address, sizeof(ctx));
-  LCM_DBG_Log(LCM_LOG_DEBUG, "recv FIN: rctx %p\n", ctx);
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "recv FIN: rctx %p\n", ctx);
   LCM_DBG_Assert(ctx->data_type == LCI_IOVEC,
                  "Didn't get the right context (%p type=%d)!.\n", ctx, ctx->data_type);
   // recvl has been completed locally. Need to process completion.

src/include/lcm_archive.h

@@ -84,10 +84,10 @@ static inline int LCM_archive_put(LCM_archive_t* archive,
   if (archive->ptr[key].val == LCM_ARCHIVE_EMPTY) {
     archive->ptr[key].val = value;
     *key_ptr = key;
-    LCM_DBG_Log(LCM_LOG_DEBUG, "Archive (%lu, %p) succeed!\n", key, (void*)value);
+    LCM_DBG_Log_default(LCM_LOG_DEBUG, "Archive (%lu, %p) succeed!\n", key, (void*)value);
     return LCM_SUCCESS;
   } else {
-    LCM_DBG_Log(LCM_LOG_DEBUG, "Archive (%lu, %p) conflicting with %p RETRY!\n", key, (void*)value, (void*)archive->ptr[key].val);
+    LCM_DBG_Log_default(LCM_LOG_DEBUG, "Archive (%lu, %p) conflicting with %p RETRY!\n", key, (void*)value, (void*)archive->ptr[key].val);
     return LCM_RETRY;
   }
 }
@@ -105,7 +105,7 @@ static inline LCM_archive_val_t LCM_archive_remove(LCM_archive_t* archive,
   // so no data race should occur here
   LCM_archive_val_t val = archive->ptr[key].val;
   archive->ptr[key].val = LCM_ARCHIVE_EMPTY;
-  LCM_DBG_Log(LCM_LOG_DEBUG, "Archive remove (%lu, %p)\n", key, (void*)val);
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "Archive remove (%lu, %p)\n", key, (void*)val);
 //    LCM_archive_val_t old;
 //    while (true) {
 //        old = __sync_val_compare_and_swap(&(archive.ptr[key].val), val,

src/include/lcm_log.h

@@ -7,17 +7,21 @@ extern "C" {
 
 #define LCM_API __attribute__((visibility("default")))
 
-#define LCM_Log(log_level, ...) \
-        LCM_Log_(log_level, __FILE__, __func__, __LINE__, __VA_ARGS__)
 #define LCM_Assert(Expr, ...) \
         LCM_Assert_(#Expr, Expr, __FILE__, __func__, __LINE__, __VA_ARGS__)
+#define LCM_Log(log_level, log_type, ...) \
+        LCM_Log_(log_level, log_type, __FILE__, __func__, __LINE__, __VA_ARGS__)
+#define LCM_Log_default(log_level, ...) \
+        LCM_Log(log_level, "default", __VA_ARGS__)
 
 #ifdef LCM_DEBUG
 #define LCM_DBG_Assert(...) LCM_Assert(__VA_ARGS__)
 #define LCM_DBG_Log(...) LCM_Log(__VA_ARGS__)
+#define LCM_DBG_Log_default(...) LCM_Log_default(__VA_ARGS__)
 #else
 #define LCM_DBG_Assert(...)
 #define LCM_DBG_Log(...)
+#define LCM_DBG_Log_default(...)
 #endif
 
 enum LCM_log_level_t {
@@ -30,17 +34,21 @@ enum LCM_log_level_t {
 };
 
 LCM_API
-extern int LCM_Init();
+extern void LCM_Init(int rank);
+
+LCM_API
+void LCM_Fina();
 
 LCM_API
 void LCM_Assert_(const char *expr_str, int expr, const char *file,
                   const char *func, int line, const char *format, ...)
 __attribute__((__format__(__printf__, 6, 7)));
 
 LCM_API
-void LCM_Log_(enum LCM_log_level_t log_level, const char *file,
-               const char *func, int line, const char *format, ...)
-__attribute__((__format__(__printf__, 5, 6)));
+void LCM_Log_(enum LCM_log_level_t log_level, const char *log_type,
+              const char *file, const char *func, int line,
+              const char *format, ...)
+__attribute__((__format__(__printf__, 6, 7)));
 
 #if defined(__cplusplus)
 }

src/include/server/server_ibv.h

@@ -142,7 +142,7 @@ static inline int LCID_poll_cq(LCIS_server_t s, LCIS_cq_entry_t *entry)
 
 static inline void lc_server_post_recv(LCIS_server_t s, void *buf, uint32_t size, LCIS_mr_t mr, void *ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post recv: buf %p size %u lkey %u user_context %p\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post recv: buf %p size %u lkey %u user_context %p\n",
               buf, size, ibv_rma_lkey(mr), ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;
   struct ibv_sge list;
@@ -161,7 +161,7 @@ static inline void lc_server_post_recv(LCIS_server_t s, void *buf, uint32_t size
 static inline LCI_error_t lc_server_sends(LCIS_server_t s, int rank, void* buf,
                                           size_t size, LCIS_meta_t meta)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post sends: rank %d buf %p size %lu meta %d\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post sends: rank %d buf %p size %lu meta %d\n",
               rank, buf, size, meta);
   LCISI_server_t *server = (LCISI_server_t*) s;
   LCM_DBG_Assert(size <= server->max_inline, "%lu exceed the inline message size"
@@ -198,7 +198,7 @@ static inline LCI_error_t lc_server_send(LCIS_server_t s, int rank, void* buf,
                                          size_t size, LCIS_mr_t mr, LCIS_meta_t meta,
                                          void* ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post send: rank %d buf %p size %lu lkey %d meta %d ctx %p\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post send: rank %d buf %p size %lu lkey %d meta %d ctx %p\n",
               rank, buf, size, ibv_rma_lkey(mr), meta, ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;
 
@@ -229,7 +229,7 @@ static inline LCI_error_t lc_server_puts(LCIS_server_t s, int rank, void* buf,
                                          size_t size, uintptr_t base,
                                          uint32_t offset, LCIS_rkey_t rkey)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
               "rkey %lu\n", rank, buf,
               size, (void*) base, offset, rkey);
   LCISI_server_t *server = (LCISI_server_t*) s;
@@ -261,7 +261,7 @@ static inline LCI_error_t lc_server_put(LCIS_server_t s, int rank, void* buf,
                                         uint32_t offset, LCIS_rkey_t rkey,
                                         void* ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %u base %p "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %u base %p "
               "offset %d rkey %lu ctx %p\n", rank, buf,
               size, ibv_rma_lkey(mr), (void*) base, offset, rkey, ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;
@@ -293,7 +293,7 @@ static inline LCI_error_t lc_server_putImms(LCIS_server_t s, int rank, void* buf
                                          size_t size, uintptr_t base, uint32_t offset,
                                          LCIS_rkey_t rkey, uint32_t meta)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
               "rkey %lu meta %d\n", rank, buf,
               size, (void*) base, offset, rkey, meta);
   LCISI_server_t *server = (LCISI_server_t*) s;
@@ -326,7 +326,7 @@ static inline LCI_error_t lc_server_putImm(LCIS_server_t s, int rank, void* buf,
                                         uint32_t offset, LCIS_rkey_t rkey,
                                         LCIS_meta_t meta, void* ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %u base %p "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %u base %p "
               "offset %d rkey %lu meta %u ctx %p\n", rank, buf,
               size, ibv_rma_lkey(mr), (void*) base, offset, rkey, meta, ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;

src/include/server/server_ofi.h

@@ -55,15 +55,15 @@ static inline uintptr_t _real_server_reg(LCIS_server_t s, void* buf, size_t size
   FI_SAFECALL(fi_mr_reg(server->domain, buf, size,
                         FI_READ | FI_WRITE | FI_REMOTE_WRITE, 0, rdma_key, 0,
                         &mr, 0));
-  LCM_DBG_Log(LCM_LOG_DEBUG, "real mem reg: mr %p buf %p size %lu lkey %p rkey %lu\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "real mem reg: mr %p buf %p size %lu lkey %p rkey %lu\n",
               mr, buf, size, fi_mr_desc(mr), fi_mr_key(mr));
   return (uintptr_t)mr;
 }
 
 static inline void _real_server_dereg(uintptr_t mr_opaque)
 {
   struct fid_mr *mr = (struct fid_mr*) mr_opaque;
-  LCM_DBG_Log(LCM_LOG_DEBUG, "real mem dereg: mr %p lkey %p rkey %lu\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "real mem dereg: mr %p lkey %p rkey %lu\n",
               mr, fi_mr_desc(mr), fi_mr_key(mr));
   FI_SAFECALL(fi_close((struct fid*) &mr->fid));
 }
@@ -164,7 +164,7 @@ static inline void lc_server_post_recv(LCIS_server_t s, void *buf, uint32_t size
 static inline LCI_error_t lc_server_sends(LCIS_server_t s, int rank, void* buf,
                                           size_t size, LCIS_meta_t meta)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post sends: rank %d buf %p size %lu meta %d\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post sends: rank %d buf %p size %lu meta %d\n",
               rank, buf, size, meta);
   LCISI_server_t *server = (LCISI_server_t*) s;
   int ret = fi_tinjectdata(server->ep, buf, size, meta, server->peer_addrs[rank],
@@ -179,7 +179,7 @@ static inline LCI_error_t lc_server_send(LCIS_server_t s, int rank, void* buf,
                                          LCIS_meta_t meta,
                                          void* ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post send: rank %d buf %p size %lu lkey %p meta %d ctx %p\n",
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post send: rank %d buf %p size %lu lkey %p meta %d ctx %p\n",
               rank, buf, size, ofi_rma_lkey(mr), meta, ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;
   int ret = fi_tsenddata(server->ep, buf, size, ofi_rma_lkey(mr),
@@ -194,7 +194,7 @@ static inline LCI_error_t lc_server_puts(LCIS_server_t s, int rank, void* buf,
                                          size_t size, uintptr_t base,
                                          uint32_t offset, LCIS_rkey_t rkey)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
               "rkey %lu\n", rank, buf,
               size, (void*) base, offset, rkey);
   LCISI_server_t *server = (LCISI_server_t*) s;
@@ -215,7 +215,7 @@ static inline LCI_error_t lc_server_put(LCIS_server_t s, int rank, void* buf,
                                         uintptr_t base, uint32_t offset,
                                         LCIS_rkey_t rkey, void* ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %p base %p "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %p base %p "
               "offset %d rkey %lu ctx %p\n", rank, buf,
               size, ofi_rma_lkey(mr), (void*) base, offset, rkey, ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;
@@ -237,7 +237,7 @@ static inline LCI_error_t lc_server_putImms(LCIS_server_t s, int rank, void* buf
                                             uint32_t offset, LCIS_rkey_t rkey,
                                             uint32_t meta)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post puts: rank %d buf %p size %lu base %p offset %d "
                              "rkey %lu meta %d\n", rank, buf,
               size, (void*) base, offset, rkey, meta);
   LCISI_server_t *server = (LCISI_server_t*) s;
@@ -259,7 +259,7 @@ static inline LCI_error_t lc_server_putImm(LCIS_server_t s, int rank, void* buf,
                                            LCIS_rkey_t rkey, LCIS_meta_t meta,
                                            void* ctx)
 {
-  LCM_DBG_Log(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %p base %p "
+  LCM_DBG_Log_default(LCM_LOG_DEBUG, "post put: rank %d buf %p size %lu lkey %p base %p "
                              "offset %d rkey %lu meta %u ctx %p\n", rank, buf,
               size, ofi_rma_lkey(mr), (void*) base, offset, rkey, meta, ctx);
   LCISI_server_t *server = (LCISI_server_t*) s;

src/include/server/server_psm2.h

@@ -320,7 +320,7 @@ static inline void lc_server_post_recv(LCIS_server_t s, lc_packet* p)
   if (p == NULL) {
     if (s->recv_posted == LCI_SERVER_MAX_RCVS / 2 && !g_server_no_recv_packets) {
       g_server_no_recv_packets = 1;
-      LCM_DBG_Log(LCM_LOG_WARN, "deadlock alert\n");
+      LCM_DBG_Log_default(LCM_LOG_WARN, "deadlock alert\n");
     }
     return;
   }