Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit eba95a6

Browse files
Haiyang-coderHaiyang-coder
committed
添加调试日志，并没有修改正确bug
1 parent 74c2824 commit eba95a6

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

‎PlayServer/Loggere.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,11 @@ class CLoggerServer
119119
static void Trace(const LogInfo& info)
120120
{
121121
static thread_local CLocalSocket client;
122+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s client=%d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), (int)client);
122123
int ret = 0;
123124
if (client == -1)
124125
{
125-
126+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s %s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), "client == -1");
126127
ret = client.Init(CSockParam("./log/server.socket", 0));
127128
if (ret != 0)
128129
{
@@ -186,6 +187,7 @@ class CLoggerServer
186187
}
187188
if (events[i].events & EPOLLIN)
188189
{
190+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s epollin =%s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), "============检测到epollin事件");
189191
if (events[i].data.ptr == m_pServer)
190192
{
191193
CSocketBase* pClient = NULL;
@@ -194,7 +196,7 @@ class CLoggerServer
194196
printf("%s(%d):<%s> pid = %d errno = %d msg:%s ret = %d socket = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), r, (int)*pClient);
195197
if (r < 0) continue;
196198
r = m_epoll.Add(*pClient, EpollData((void*)pClient), EPOLLIN | EPOLLERR);
197-
printf("%s(%d):<%s> pid = %d errno = %d msg:%s ret = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), r);
199+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s ret = %d clientSocket = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), r, (int)*pClient);
198200
if (r < 0)
199201
{
200202
printf("%s(%d):<%s> pid = %d errno = %d msg:%s ret = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), r);

‎PlayServer/Socket.h‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class CLocalSocket:public CSocketBase
197197
int type = (m_param.arrt & SOCK_ISUDP) ? SOCK_DGRAM : SOCK_STREAM;
198198
if (m_socket == -1)
199199
{
200+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno));
200201
m_socket = socket(PF_LOCAL, type, 0);
201202
}
202203
else
@@ -207,6 +208,7 @@ class CLocalSocket:public CSocketBase
207208
int ret = 0;
208209
if (m_param.arrt & SOCK_ISSERVER)
209210
{
211+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno));
210212
ret = bind(m_socket, m_param.addrun(), sizeof(sockaddr_un));
211213
if (ret == -1)
212214
{
@@ -218,6 +220,7 @@ class CLocalSocket:public CSocketBase
218220

219221
if (m_param.arrt & SOCK_ISNOBLOCK)
220222
{
223+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno));
221224
int option = fcntl(m_socket, F_GETFL);
222225
if (option < 0) return -5;
223226
option |= O_NONBLOCK;
@@ -226,9 +229,10 @@ class CLocalSocket:public CSocketBase
226229
}
227230
if (m_status == 0)
228231
{
232+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno));
229233
m_status = 1;
230234
}
231-
235+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s m_socket = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), m_socket);
232236
return 0;
233237
}
234238
//连接: 服务器：accept 客户端：connect; udp直接返回成功
@@ -246,6 +250,7 @@ class CLocalSocket:public CSocketBase
246250
sockaddr_un addr_un;
247251
socklen_t len = sizeof(addr_un);
248252
int fd = accept(m_socket, param.addrun(), &len);
253+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s m_socket = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), m_socket);
249254
if (fd == -1) return -3;
250255
*ppClient = new CLocalSocket(fd);
251256
if (*ppClient == NULL)
@@ -255,6 +260,7 @@ class CLocalSocket:public CSocketBase
255260
ret = (*ppClient)->Init(param);
256261
if (ret != 0)
257262
{
263+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s ret = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), ret);
258264
delete* ppClient;
259265
*ppClient = NULL;
260266
return -5;
@@ -266,14 +272,16 @@ class CLocalSocket:public CSocketBase
266272
if (ret != 0) return -6;
267273
}
268274
m_status = 2;
275+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s m_socket = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), m_socket);
269276
return 0;
270277

271278
}
272279
//发送数据
273280
virtual int Send(const Buffer& data)
274281
{
275282
printf("%s(%d):<%s> pid = %d errno = %d msg:%s len = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), data.size());
276-
printf("%s(%d):<%s> pid = %d errno = %d msg:%s len = %s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), data.c_str());
283+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s data = %s\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), data.c_str());
284+
printf("%s(%d):<%s> pid = %d errno = %d msg:%s socket = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), m_socket);
277285
if (m_status < 2 || m_socket == -1) return -1;
278286
size_t index = 0;//size_t是无符号的，ssize_t是有符号的
279287
while (index < data.size())

‎PlayServer/main.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
int LogTest()
1313
{
1414
sleep(5);
15+
printf("%s(%d):<%s> pid = %d %s \n" , __FILE__, __LINE__, __FUNCTION__, getpid(), "trace start");
1516
char buffer[] = "hell !d大大啊爱看";
16-
TRACEI("here is log 大大 释放 ");
17+
TRACEI("here is log 大大 释放 \n");
1718
//printf("%s(%d):<%s> pid = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid());
1819
//DUMPD((void*)buffer,sizeof(buffer));
1920
//printf("%s(%d):<%s> pid = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid());
@@ -38,7 +39,7 @@ int CreateLogServer(CProcess* proc)
3839
while (true)
3940
{
4041
ret = proc->RecvFd(fd);
41-
if (fd == -1 )
42+
if (fd <= -1 )
4243
{
4344
break;
4445
}
@@ -103,5 +104,6 @@ int main()
103104
//close(fd);
104105
ret = procLog.SendFD(-1);
105106
printf("%s(%d):<%s> pid = %d errno = %d msg:%s ret = %d\n", __FILE__, __LINE__, __FUNCTION__, getpid(), errno, strerror(errno), ret);
107+
getchar();
106108
return 0;
107109
}

0 commit comments

Comments
 (0)