summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7c4caa5)
raw | patch | inline | side by side (parent: 7c4caa5)
author | Ramsey Harris <ramsey@ti.com> | |
Thu, 16 Apr 2015 00:11:34 +0000 (17:11 -0700) | ||
committer | Robert Tivy <rtivy@ti.com> | |
Thu, 16 Apr 2015 23:06:32 +0000 (16:06 -0700) |
Clean up some log statements in NameServer_daemon.c. Combine
multiple consecutive log statements using new LOG4 macro. This
removes the embedded timestamp which made it hard to read the logs.
multiple consecutive log statements using new LOG4 macro. This
removes the embedded timestamp which made it hard to read the logs.
linux/include/_lad.h | patch | blob | history | |
linux/src/daemon/NameServer_daemon.c | patch | blob | history |
diff --git a/linux/include/_lad.h b/linux/include/_lad.h
index 166b9ce76adf69b98f63f7334e1a223dc8e6f77b..b21cec1443672a0cd208537c5972d66b833c72f5 100644 (file)
--- a/linux/include/_lad.h
+++ b/linux/include/_lad.h
fflush(logPtr); \
}
+#define LOG4(a, b, c, d, e) \
+ if (logFile == TRUE) { \
+ struct timeval tv; \
+ gettimeofday(&tv, NULL); \
+ fprintf(logPtr, "[%d.%06d] " a, \
+ (unsigned int)(tv.tv_sec - start_tv.tv_sec), \
+ (unsigned int)tv.tv_usec, b, c, d, e); \
+ fflush(logPtr); \
+ }
+
/* macros for generating verbose output: */
#define PRINTVERBOSE0(a) \
if (verbose == TRUE) { printf(a); }
index 13a0cd0c2eec7b148352fe230782ff542f4f60a8..56b21493d94f415ed9d2a431d77e870bbe3a3513 100644 (file)
}
}
- LOG2("NameServer Response: instanceName: %s, name: %s,",
- (String)msg->instanceName, (String)msg->name)
/* set the request status */
if (status < 0) {
- LOG1(" Value not found, status: %d\n", status)
+ LOG3("NameServer Response: instance: %s, name: %s, value not "
+ "found, status: %d\n", (String)msg->instanceName,
+ (String)msg->name, status);
msg->requestStatus = 0;
}
else {
+ LOG3("NameServer Response: instance: %s, name: %s, value: 0x%x\n",
+ (String)msg->instanceName, (String)msg->name, msg->value);
msg->requestStatus = 1;
- LOG1(" Value: 0x%x\n", msg->value)
}
/* specify message as a response */
}
else {
LOG1("listener_cb: recvfrom socket: fd: %d\n", sock)
- LOG2("\tReceived ns msg: nbytes: %d, from addr: %d, ",
- nbytes, fromAddr.addr)
- LOG1("from vproc: %d\n", fromAddr.vproc_id)
+ LOG3("\tReceived ns msg: nbytes: %d, from addr: %d, "
+ "from vproc: %d\n", nbytes, fromAddr.addr,
+ fromAddr.vproc_id);
NameServerRemote_processMessage(&msg, procId);
}
}
strncpy((char *)nsMsg.instanceName, obj->name, strlen(obj->name) + 1);
strncpy((char *)nsMsg.name, name, strlen(name) + 1);
- LOG2("NameServer_getRemote: Requesting from procId %d, %s:",
- procId, (String)nsMsg.instanceName)
- LOG1("%s...\n", (String)nsMsg.name)
+ LOG3("NameServer_getRemote: requesting from procId %d, %s: %s\n",
+ procId, (String)nsMsg.instanceName, (String)nsMsg.name);
err = send(sock, &nsMsg, sizeof(NameServerRemote_Msg), 0);
if (err < 0) {
/* set the contents of value */
if (*len <= sizeof (Bits32)) {
*(UInt32 *)value = (UInt32)replyMsg->value;
- LOG2("NameServer_getRemote: Reply from: %d, %s:",
- procId, (String)replyMsg->instanceName)
- LOG2("%s, value: 0x%x...\n",
- (String)replyMsg->name, *(UInt32 *)value)
+ LOG4("NameServer_getRemote: Reply from: %d, %s: "
+ "name: %s, value: 0x%x\n", procId,
+ (String)replyMsg->instanceName,
+ (String)replyMsg->name, *(UInt32 *)value);
}
else {
memcpy(value, replyMsg->valueBuf, *len);