summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-01-23 19:25:56 +0100
committerTycho <work.tycho+git@gmail.com>2014-01-23 19:25:56 +0100
commit741957914073eb9f4a1fa0cd5ae90cc17078a623 (patch)
treeb7be022fcf6e3db7aa9962158f39cd93279fda60 /src
parentFixed crash while calling disabled plugins. (diff)
downloadcuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.tar
cuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.tar.gz
cuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.tar.bz2
cuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.tar.lz
cuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.tar.xz
cuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.tar.zst
cuberite-741957914073eb9f4a1fa0cd5ae90cc17078a623.zip
Diffstat (limited to 'src')
-rw-r--r--src/OSSupport/Event.cpp24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index cbacbba17..fe1128dc9 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -7,7 +7,9 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Event.h"
-
+#if not defined(_WIN32)
+#include <string.h>
+#endif
@@ -35,14 +37,18 @@ cEvent::cEvent(void)
m_Event = sem_open(EventName.c_str(), O_CREAT, 777, 0 );
if (m_Event == SEM_FAILED)
{
- LOGERROR("cEvent: Cannot create event, errno = %i. Aborting server.", errno);
+ char buffer[1024];
+ strerror_r(errno,buffer,1024);
+ LOGERROR("cEvent: Cannot create event, err = %s. Aborting server.", buffer);
abort();
}
// Unlink the semaphore immediately - it will continue to function but will not pollute the namespace
// We don't store the name, so can't call this in the destructor
if (sem_unlink(EventName.c_str()) != 0)
{
- LOGWARN("ERROR: Could not unlink cEvent. (%i)", errno);
+ char buffer[1024];
+ strerror_r(errno,buffer,1024);
+ LOGWARN("ERROR: Could not unlink cEvent. (%s)", buffer);
}
}
#endif // *nix
@@ -61,7 +67,9 @@ cEvent::~cEvent()
{
if (sem_close(m_Event) != 0)
{
- LOGERROR("ERROR: Could not close cEvent. (%i)", errno);
+ char buffer[1024];
+ strerror_r(errno,buffer,1024);
+ LOGERROR("ERROR: Could not close cEvent. (%s)", buffer);
}
}
else
@@ -88,7 +96,9 @@ void cEvent::Wait(void)
int res = sem_wait(m_Event);
if (res != 0 )
{
- LOGWARN("cEvent: waiting for the event failed: %i, errno = %i. Continuing, but server may be unstable.", res, errno);
+ char buffer[1024];
+ strerror_r(errno,buffer,1024);
+ LOGWARN("cEvent: waiting for the event failed: %i, err = %s. Continuing, but server may be unstable.", res, buffer);
}
#endif
}
@@ -108,7 +118,9 @@ void cEvent::Set(void)
int res = sem_post(m_Event);
if (res != 0)
{
- LOGWARN("cEvent: Could not set cEvent: %i, errno = %d", res, errno);
+ char buffer[1024];
+ strerror_r(errno,buffer,1024);
+ LOGWARN("cEvent: Could not set cEvent: %i, err = %s", res, buffer);
}
#endif
}