From 5fe2618c0eed3638cc108e2b5f66f3ddf933202d Mon Sep 17 00:00:00 2001 From: David Addison Date: Thu, 29 Nov 2018 13:31:36 -0800 Subject: [PATCH] Fixed some compilation errors when TRACE=1 set --- src/include/socket.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/include/socket.h b/src/include/socket.h index 0856f9d..624af40 100644 --- a/src/include/socket.h +++ b/src/include/socket.h @@ -361,8 +361,8 @@ static ncclResult_t connectAddress(int* fd, union socketAddress* remoteAddr) { SYSCHECK(setsockopt(*fd, SOL_SOCKET, SO_SNDBUF, (char*)&bufsize, sizeof(int)), "setsockopt"); SYSCHECK(setsockopt(*fd, SOL_SOCKET, SO_RCVBUF, (char*)&bufsize, sizeof(int)), "setsockopt");*/ -#ifdef ENABLE_TRACE char line[1024]; +#ifdef ENABLE_TRACE TRACE(NCCL_INIT|NCCL_NET,"Connecting to socket %s", socketToString(&remoteAddr->sa, line)); #endif @@ -372,11 +372,10 @@ retry: SYSCHECKSYNC(connect(*fd, &remoteAddr->sa, salen), "connect", ret); if (ret == 0) return ncclSuccess; if (errno == ECONNREFUSED && ++retries < RETRY_TIMES) { - INFO(ALL,"Call to connect returned %s, retrying", strerror(errno)); \ + INFO(NCCL_ALL,"Call to connect returned %s, retrying", strerror(errno)); \ usleep(SLEEP_INT); goto retry; } - char line[1024]; WARN("Connect to %s failed : %s", socketToString(&remoteAddr->sa, line), strerror(errno)); return ncclSystemError; }