diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-31 11:45:53 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-31 11:45:53 +0100 |
| commit | 8baa2345419ddaf4a72e91e967a03d8b5dbc33f0 (patch) | |
| tree | fcd2c5be9c7a7d55a3127e02e7864711bc24b365 | |
| parent | Linux fixes, but while it compiles, when a user joins it crashes the server with "*** glibc detected *** ./MCServer: double free or corruption (out): 0x00007fb5f5158db0 ***" (diff) | |
| download | cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.tar cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.tar.gz cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.tar.bz2 cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.tar.lz cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.tar.xz cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.tar.zst cuberite-8baa2345419ddaf4a72e91e967a03d8b5dbc33f0.zip | |
| -rw-r--r-- | source/cEvent.cpp | 159 | ||||
| -rw-r--r-- | source/cEvent.h | 47 |
2 files changed, 124 insertions, 82 deletions
diff --git a/source/cEvent.cpp b/source/cEvent.cpp index 18c1ac09b..727cab81c 100644 --- a/source/cEvent.cpp +++ b/source/cEvent.cpp @@ -1,107 +1,120 @@ +// cEvent.cpp
+
+// Implements the cEvent object representing an OS-specific synchronization primitive that can be waited-for
+// Implemented as an Event on Win and as a 1-semaphore on *nix
+
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+#include "cEvent.h"
-cEvent::cEvent( unsigned int a_NumEvents /* = 1 */ )
- : m_NumEvents( a_NumEvents )
-#ifndef _WIN32
- , m_bNamed( false )
-#endif
-{
- if( m_NumEvents < 1 ) m_NumEvents = 1;
+cEvent::cEvent(void)
+{
#ifdef _WIN32
- m_Handle = new HANDLE[ m_NumEvents ];
- for( unsigned int i = 0; i < m_NumEvents; i++)
+ m_Event = CreateEvent( 0, FALSE, FALSE, 0 );
+ if (m_Event == NULL)
{
- ((HANDLE*)m_Handle)[i] = CreateEvent( 0, FALSE, FALSE, 0 );
+ LOGERROR("cEvent: cannot create event, GLE = %d. Aborting server.", GetLastError());
+ abort();
}
-#else
- m_Handle = new sem_t*[ m_NumEvents ];
- for( unsigned int i = 0; i < m_NumEvents; i++)
+#else // *nix
+ m_bIsNamed = false;
+ if (sem_init(m_Event, 0, 0))
{
+ LOGWARN("WARNING cEvent: Could not create unnamed semaphore, fallback to named.");
+
+ // _X: I'm unconvinced about using sem_unlink() just after a successful sem_open(), it seems wrong - why destroy the object just after creating?
+ assert(!"This codepath is really weird, if it is ever used, please check that everything works.");
+
+ m_bIsNamed = true;
- sem_t* & HandlePtr = ((sem_t**)m_Handle)[i];
- HandlePtr = new sem_t;
-
- if( sem_init( HandlePtr, 0, 0 ) )
- {
- LOG("WARNING cEvent: Could not create unnamed semaphore, fallback to named.");
- m_bNamed = true;
- delete HandlePtr; // named semaphores return their own address
-
- char c_Str[32];
- sprintf( c_Str, "cEvent%p", &HandlePtr );
- HandlePtr = sem_open( c_Str, O_CREAT, 777, 0 );
- if( HandlePtr == SEM_FAILED )
- LOG("ERROR: Could not create Event. (%i)", errno);
- else
- if( sem_unlink( c_Str ) != 0 )
- LOG("ERROR: Could not unlink cEvent. (%i)", errno);
- }
+ char c_Str[64];
+ sprintf(c_Str, "cEvent%p", this);
+ m_Event = sem_open( c_Str, O_CREAT, 777, 0 );
+ if (m_Event == SEM_FAILED)
+ {
+ LOGERROR("cEvent: Cannot create event, errno = %i. Aborting server.", errno);
+ abort();
+ }
+ else
+ {
+ if( sem_unlink( c_Str ) != 0 )
+ {
+ LOGWARN("ERROR: Could not unlink cEvent. (%i)", errno);
+ }
+ }
}
-#endif
+#endif // *nix
}
+
+
+
+
cEvent::~cEvent()
{
#ifdef _WIN32
- for( unsigned int i = 0; i < m_NumEvents; i++ )
- {
- CloseHandle( ((HANDLE*)m_Handle)[i] );
- }
- delete [] (HANDLE*)m_Handle;
+ CloseHandle(m_Event);
#else
- for( unsigned int i = 0; i < m_NumEvents; i++ )
- {
- if( m_bNamed )
- {
- sem_t* & HandlePtr = ((sem_t**)m_Handle)[i];
- char c_Str[32];
- sprintf( c_Str, "cEvent%p", &HandlePtr );
- // LOG("Closing event: %s", c_Str );
- // LOG("Sem ptr: %p", HandlePtr );
- if( sem_close( HandlePtr ) != 0 )
- {
- LOG("ERROR: Could not close cEvent. (%i)", errno);
- }
- }
- else
- {
- sem_destroy( ((sem_t**)m_Handle)[i] );
- delete ((sem_t**)m_Handle)[i];
- }
- }
- delete [] (sem_t**)m_Handle; m_Handle = 0;
+ if (m_bIsNamed)
+ {
+ if (sem_close(m_Event) != 0)
+ {
+ LOGERROR("ERROR: Could not close cEvent. (%i)", errno);
+ }
+ }
+ else
+ {
+ sem_destroy(m_Event);
+ }
#endif
}
-void cEvent::Wait()
+
+
+
+
+void cEvent::Wait(void)
{
#ifdef _WIN32
- WaitForMultipleObjects( m_NumEvents, (HANDLE*)m_Handle, true, INFINITE );
+ DWORD res = WaitForSingleObject(m_Event, INFINITE);
+ if (res != WAIT_OBJECT_0)
+ {
+ LOGWARN("cEvent: waiting for the event failed: %d, GLE = %d. Continuing, but server may be unstable.", res, GetLastError());
+ }
#else
- for(unsigned int i = 0; i < m_NumEvents; i++)
- {
- if( sem_wait( ((sem_t**)m_Handle)[i] ) != 0 )
- {
- LOG("ERROR: Could not wait for cEvent. (%i)", errno);
- }
- }
+ 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);
+ }
#endif
}
-void cEvent::Set(unsigned int a_EventNum /* = 0 */)
+
+
+
+
+void cEvent::Set(void)
{
#ifdef _WIN32
- SetEvent( ((HANDLE*)m_Handle)[a_EventNum] );
+ if (SetEvent(m_Event))
+ {
+ LOGWARN("cEvent: Could not set cEvent: GLE = %d", GetLastError());
+ }
#else
- if( sem_post( ((sem_t**)m_Handle)[a_EventNum] ) != 0 )
- {
- LOG("ERROR: Could not set cEvent. (%i)", errno);
- }
+ int res = sem_post(m_Event);
+ if (res != 0)
+ {
+ LOGWARN("cEvent: Could not set cEvent: %i, errno = %d", res, errno);
+ }
#endif
}
+
+
+
+
diff --git a/source/cEvent.h b/source/cEvent.h index b0b1d73be..11b9d7098 100644 --- a/source/cEvent.h +++ b/source/cEvent.h @@ -1,18 +1,47 @@ +
+// cEvent.h
+
+// Interfaces to the cEvent object representing an OS-specific synchronization primitive that can be waited-for
+// Implemented as an Event on Win and as a 1-semaphore on *nix
+
+
+
+
+
#pragma once
+#ifndef CEVENT_H_INCLUDED
+#define CEVENT_H_INCLUDED
+
+
+
+
class cEvent
{
public:
- cEvent( unsigned int a_NumEvents = 1 );
+ cEvent(void);
~cEvent();
- void Wait();
- void Set(unsigned int a_EventNum = 0);
+ void Wait(void);
+ void Set (void);
+
private:
- unsigned int m_NumEvents;
- void* m_Handle; // HANDLE[] pointer
-#ifndef _WIN32
- bool m_bNamed;
-#endif
-};
+ #ifdef _WIN32
+ HANDLE m_Event;
+ #else
+ sem_t * m_Event;
+ bool m_bIsNamed;
+ #endif
+} ;
+
+
+
+
+
+
+#endif // CEVENT_H_INCLUDED
+
+
+
+
|