diff options
author | Mike Selivanov <mikes777@gmail.com> | 2015-07-09 01:11:40 +0300 |
---|---|---|
committer | Mike Selivanov <mikes777@gmail.com> | 2015-07-09 01:11:40 +0300 |
commit | 29d330522dda377a264c21073bb8e002f68c7798 (patch) | |
tree | 413036c4ceb0caf8f6833d23411f4444ae35648f | |
parent | ff497063732fdc08300c8bc166f4d4f62317e98a (diff) |
Fixed OSX CPU utilization by replacing broken kevent() with select()
-rw-r--r-- | src/Mayaqua/Network.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c index b64fc253..c2d11e65 100644 --- a/src/Mayaqua/Network.c +++ b/src/Mayaqua/Network.c @@ -9124,12 +9124,23 @@ void UnixSetSockEvent(SOCK_EVENT *event) }
}
+// This is a helper function for select()
+int safe_fd_set(int fd, fd_set* fds, int* max_fd) {
+ FD_SET(fd, fds);
+ if (fd > *max_fd) {
+ *max_fd = fd;
+ }
+ return 0;
+}
+
// Execute 'select' for the socket
void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, UINT timeout)
{
#ifdef UNIX_MACOS
- int kq;
- struct kevent *kevents;
+ fd_set rfds; //read descriptors
+ fd_set wfds; //write descriptors
+ int max_fd = 0; //maximum descriptor id
+ struct timeval tv; //timeval for timeout
#else // UNIX_MACOS
struct pollfd *p;
#endif // UNIX_MACOS
@@ -9170,8 +9181,8 @@ void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, U num = num_read_total + num_write_total;
#ifdef UNIX_MACOS
- kq = kqueue();
- kevents = ZeroMallocFast(sizeof(struct kevent) * (num + num_write_total));
+ FD_ZERO(&rfds); //zero out descriptor set for read descriptors
+ FD_ZERO(&wfds); //same for write
#else // UNIX_MACOS
p = ZeroMallocFast(sizeof(struct pollfd) * num);
#endif // UNIX_MACOS
@@ -9183,7 +9194,7 @@ void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, U if (reads[i] != INVALID_SOCKET)
{
#ifdef UNIX_MACOS
- EV_SET(&kevents[n++], reads[i], EVFILT_READ, EV_ADD, 0, 0, NULL);
+ safe_fd_set(reads[i], &rfds, &max_fd);
#else // UNIX_MACOS
struct pollfd *pfd = &p[n++];
pfd->fd = reads[i];
@@ -9197,8 +9208,7 @@ void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, U if (writes[i] != INVALID_SOCKET)
{
#ifdef UNIX_MACOS
- EV_SET(&kevents[n++], reads[i], EVFILT_READ, EV_ADD, 0, 0, NULL);
- EV_SET(&kevents[n++], reads[i], EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+ safe_fd_set(writes[i], &wfds, &max_fd);
#else // UNIX_MACOS
struct pollfd *pfd = &p[n++];
pfd->fd = writes[i];
@@ -9210,15 +9220,14 @@ void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, U if (num != 0)
{
#ifdef UNIX_MACOS
- struct timespec kevent_timeout, *p_kevent_timeout;
if (timeout == INFINITE) {
- p_kevent_timeout = NULL;
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
} else {
- kevent_timeout.tv_sec = timeout / 1000;
- kevent_timeout.tv_nsec = (timeout % 1000) * 1000000l;
- p_kevent_timeout = &kevent_timeout;
+ tv.tv_sec = timeout / 1000;
+ tv.tv_usec = (timeout % 1000) * 1000l;
}
- kevent(kq, kevents, n, kevents, n, p_kevent_timeout);
+ select(max_fd + 1, &rfds, &wfds, NULL, &tv);
#else // UNIX_MACOS
poll(p, num, timeout == INFINITE ? -1 : (int)timeout);
#endif // UNIX_MACOS
@@ -9228,12 +9237,9 @@ void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, U SleepThread(timeout);
}
-#ifdef UNIX_MACOS
- Free(kevents);
- close(kq);
-#else // UNIX_MACOS
+#ifndef UNIX_MACOS
Free(p);
-#endif // UNIX_MACOS
+#endif // not UNIX_MACOS
}
// Clean-up of the socket event
|