2004-08-24. It should be unnecessary now.
* msg.cc (client_request_msg::serve): Release process critical
section as early as possible.
* sem.cc (client_request_sem::serve): Ditto.
* shm.cc (client_request_shm::serve): Ditto.
* process.cc: Use hold and release method calls instead of
EnterCriticalSection/LeaveCriticalSection calls throughout.
* process.h (_hold): Rename from hold. Take filename and linenumber
parameter for logging. Define matching hold macro.
(release): Ditto.
+2004-10-04 Corinna Vinschen <corinna@vinschen.de>
+
+ * bsd_mutex.cc (_msleep): Simplify event creation. Revert change from
+ 2004-08-24. It should be unnecessary now.
+ * msg.cc (client_request_msg::serve): Release process critical
+ section as early as possible.
+ * sem.cc (client_request_sem::serve): Ditto.
+ * shm.cc (client_request_shm::serve): Ditto.
+ * process.cc: Use hold and release method calls instead of
+ EnterCriticalSection/LeaveCriticalSection calls throughout.
+ * process.h (_hold): Rename from hold. Take filename and linenumber
+ parameter for logging. Define matching hold macro.
+ (release): Ditto.
+
2004-10-01 Corinna Vinschen <corinna@vinschen.de>
* sysv_sem.cc: Update to FreeBSD version 1.69.
int ret = -1;
char name[64];
msleep_event_name (ident, name);
- HANDLE evt = OpenEvent (EVENT_ALL_ACCESS, FALSE, name);
- if (!evt)
- evt = CreateEvent (NULL, TRUE, FALSE, name);
+ HANDLE evt = CreateEvent (NULL, TRUE, FALSE, name);
if (!evt)
panic ("CreateEvent in msleep (%s) failed: %E", wmesg);
if (mtx)
if ((priority & PCATCH)
&& td->client->signal_arrived () != INVALID_HANDLE_VALUE)
obj_cnt = 4;
- td->client->release ();
switch (WaitForMultipleObjects (obj_cnt, obj, FALSE, timo ?: INFINITE))
{
case WAIT_OBJECT_0: /* wakeup() has been called. */
ResetEvent (evt);
#endif
CloseHandle (evt);
- td->client->hold ();
set_priority (old_priority);
if (mtx && !(priority & PDROP))
mtx_lock (mtx);
}
if (!adjust_identity_info (&_parameters.in.ipcblk))
{
+ client->release ();
conn->revert_to_self ();
error_code (EACCES);
msglen (0);
}
/* Early revert_to_self since IPC code runs in kernel mode. */
conn->revert_to_self ();
+ /* sysv_msg.cc takes care of itself. */
+ client->release ();
thread td = { client, &_parameters.in.ipcblk, {-1, -1} };
int res;
msgop_t msgop = _parameters.in.msgop; /* Get's overwritten otherwise. */
/* Allocated by the call to adjust_identity_info(). */
if (_parameters.in.ipcblk.gidlist)
free (_parameters.in.ipcblk.gidlist);
- client->release ();
error_code (res);
if (msgop == MSGOP_msgrcv)
_parameters.out.rcv = td.td_retval[0];
GetLastError ());
}
InitializeCriticalSection (&_access);
+ debug ("initialized (%lu)", _cygpid);
}
process::~process ()
{
+ debug ("deleting (%lu)", _cygpid);
DeleteCriticalSection (&_access);
CloseHandle (_signal_arrived);
CloseHandle (_hProcess);
assert (entry);
bool res = false;
- EnterCriticalSection (&_access);
+ hold ();
if (!_cleaning_up)
{
res = true;
}
- LeaveCriticalSection (&_access);
+ release ();
return res;
}
assert (entry);
bool res = false;
- EnterCriticalSection (&_access);
+ hold ();
if (!_cleaning_up)
{
}
}
- LeaveCriticalSection (&_access);
+ release ();
return res;
}
void
process::cleanup ()
{
- EnterCriticalSection (&_access);
+ hold ();
assert (!is_active ());
assert (!_cleaning_up);
InterlockedExchange (&_cleaning_up, true);
cleanup_routine *entry = _routines_head;
_routines_head = NULL;
- LeaveCriticalSection (&_access);
+ release ();
while (entry)
{
SetEvent (_cache_add_trigger);
}
- EnterCriticalSection (&entry->_access); // To be released by the caller.
+ entry->hold (); // To be released by the caller.
LeaveCriticalSection (&_cache_write_access);
assert (entry);
assert (entry->_winpid == winpid);
class process_cache;
+#define hold() _hold(__FILE__,__LINE__)
+#define release() _release(__FILE__,__LINE__)
+
class process
{
friend class process_cache;
bool is_active () const { return _exit_status == STILL_ACTIVE; }
- void hold () { EnterCriticalSection (&_access); }
- void release () { LeaveCriticalSection (&_access); }
+ void _hold (const char *file, int line) {
+ _log (file, line, LOG_DEBUG, "Try hold(%lu)", _cygpid);
+ EnterCriticalSection (&_access);
+ _log (file, line, LOG_DEBUG, "holding (%lu)", _cygpid);
+ }
+ void _release (const char *file, int line) {
+ _log (file, line, LOG_DEBUG, "leaving (%lu)", _cygpid);
+ LeaveCriticalSection (&_access);
+ }
bool add (cleanup_routine *);
bool remove (const cleanup_routine *);
}
/* Early revert_to_self since IPC code runs in kernel mode. */
conn->revert_to_self ();
+ /* sysv_sem.cc takes care of itself. */
+ client->release ();
thread td = { client, &_parameters.in.ipcblk, {-1, -1} };
int res;
switch (_parameters.in.semop)
/* Allocated by the call to adjust_identity_info(). */
if (_parameters.in.ipcblk.gidlist)
free (_parameters.in.ipcblk.gidlist);
- client->release ();
error_code (res);
_parameters.out.ret = td.td_retval[0];
msglen (sizeof (_parameters.out));
}
/* Early revert_to_self since IPC code runs in kernel mode. */
conn->revert_to_self ();
+ /* sysv_shm.cc takes care of itself. */
+ client->release ();
thread td = { client, &_parameters.in.ipcblk, {0, 0} };
int res;
shmop_t shmop = _parameters.in.shmop; /* Get's overwritten otherwise. */
/* Allocated by the call to adjust_identity_info(). */
if (_parameters.in.ipcblk.gidlist)
free (_parameters.in.ipcblk.gidlist);
- client->release ();
error_code (res);
if (shmop == SHMOP_shmat)
_parameters.out.ptr = td.td_retval[0];
OSDN Git Service
