Prefix LOG and CHECK with AOS_
This prepares us for introducing glog more widely and transitioning
things over where they make sense.
Change-Id: Ic6c208882407bc2153fe875ffc736d66f5c8ade5
diff --git a/aos/vision/events/tcp_server.cc b/aos/vision/events/tcp_server.cc
index 0fd7225..535c6b4 100644
--- a/aos/vision/events/tcp_server.cc
+++ b/aos/vision/events/tcp_server.cc
@@ -23,10 +23,10 @@
int MakeSocketNonBlocking(int sfd) {
int flags;
- PCHECK(flags = fcntl(sfd, F_GETFL, 0));
+ AOS_PCHECK(flags = fcntl(sfd, F_GETFL, 0));
flags |= O_NONBLOCK;
- PCHECK(fcntl(sfd, F_SETFL, flags));
+ AOS_PCHECK(fcntl(sfd, F_SETFL, flags));
return 0;
}
@@ -41,7 +41,7 @@
/*
* socket: create the parent socket
*/
- PCHECK(parentfd = socket(AF_INET, SOCK_STREAM, 0));
+ AOS_PCHECK(parentfd = socket(AF_INET, SOCK_STREAM, 0));
/* setsockopt: Handy debugging trick that lets
* us rerun the server immediately after we kill it;
@@ -49,8 +49,8 @@
* Eliminates "ERROR on binding: Address already in use" error.
*/
optval = 1;
- PCHECK(setsockopt(parentfd, SOL_SOCKET, SO_REUSEADDR, (const void *)&optval,
- sizeof(int)));
+ AOS_PCHECK(setsockopt(parentfd, SOL_SOCKET, SO_REUSEADDR,
+ (const void *)&optval, sizeof(int)));
/*
* build the server's Internet address
@@ -69,11 +69,12 @@
/*
* bind: associate the parent socket with a port
*/
- PCHECK(bind(parentfd, (struct sockaddr *)&serveraddr, sizeof(serveraddr)));
+ AOS_PCHECK(
+ bind(parentfd, (struct sockaddr *)&serveraddr, sizeof(serveraddr)));
- PCHECK(listen(parentfd, SOMAXCONN));
+ AOS_PCHECK(listen(parentfd, SOMAXCONN));
- LOG(INFO, "connected to port: %d on fd: %d\n", portno, parentfd);
+ AOS_LOG(INFO, "connected to port: %d on fd: %d\n", portno, parentfd);
return parentfd;
}
@@ -94,14 +95,14 @@
connections. */
return;
} else {
- PLOG(WARNING, "accept");
+ AOS_PLOG(WARNING, "accept");
return;
}
}
/* Make the incoming socket non-blocking and add it to the
list of fds to monitor. */
- PCHECK(MakeSocketNonBlocking(infd));
+ AOS_PCHECK(MakeSocketNonBlocking(infd));
loop()->Add(Construct(infd));
}