aboutsummaryrefslogtreecommitdiff
path: root/daemon/Monitor.cpp
diff options
context:
space:
mode:
authorDrew Richardson <drew.richardson@arm.com>2015-03-28 12:00:00 -0700
committerDrew Richardson <drew.richardson@arm.com>2015-04-01 14:41:00 -0700
commitabc3535c0d237bf7968b7092e545f2ff422af954 (patch)
tree778f83b3d8fd576762290b58b12c33cca5a193e1 /daemon/Monitor.cpp
parente8f6a181be0b67fc9d9ac117bc2ed01737be654c (diff)
gator: Version 5.215.21
Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Diffstat (limited to 'daemon/Monitor.cpp')
-rw-r--r--daemon/Monitor.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/daemon/Monitor.cpp b/daemon/Monitor.cpp
index 74f22ee..0428887 100644
--- a/daemon/Monitor.cpp
+++ b/daemon/Monitor.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) ARM Limited 2013-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2013-2015. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -38,17 +38,17 @@ bool Monitor::init() {
mFd = epoll_create(16);
#endif
if (mFd < 0) {
- logg->logMessage("%s(%s:%i): epoll_create1 failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("epoll_create1 failed");
return false;
}
#ifndef EPOLL_CLOEXEC
- int fdf = fcntl(mFd, F_GETFD);
- if ((fdf == -1) || (fcntl(mFd, F_SETFD, fdf | FD_CLOEXEC) != 0)) {
- logg->logMessage("%s(%s:%i): fcntl failed", __FUNCTION__, __FILE__, __LINE__);
- ::close(mFd);
- return -1;
- }
+ int fdf = fcntl(mFd, F_GETFD);
+ if ((fdf == -1) || (fcntl(mFd, F_SETFD, fdf | FD_CLOEXEC) != 0)) {
+ logg->logMessage("fcntl failed");
+ ::close(mFd);
+ return -1;
+ }
#endif
return true;
@@ -60,7 +60,7 @@ bool Monitor::add(const int fd) {
event.data.fd = fd;
event.events = EPOLLIN;
if (epoll_ctl(mFd, EPOLL_CTL_ADD, fd, &event) != 0) {
- logg->logMessage("%s(%s:%i): epoll_ctl failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("epoll_ctl failed");
return false;
}
@@ -74,7 +74,7 @@ int Monitor::wait(struct epoll_event *const events, int maxevents, int timeout)
if (errno == EINTR) {
result = 0;
} else {
- logg->logMessage("%s(%s:%i): epoll_wait failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("epoll_wait failed");
}
}