diff options
author | ilsimo <ilsimo> | 2007-04-15 21:03:05 +0000 |
---|---|---|
committer | ilsimo <ilsimo> | 2007-04-15 21:03:05 +0000 |
commit | 7dcf60f8a0a8bd29d03d15431b2ab5ff2b0e5755 (patch) | |
tree | 6667400947cbf55834cd6e2aaff2e4fa1e743b64 /sesman | |
parent | 4175d2d8be68972a28a862d40bd71191d3b56a25 (diff) | |
download | xrdp-proprietary-7dcf60f8a0a8bd29d03d15431b2ab5ff2b0e5755.tar.gz xrdp-proprietary-7dcf60f8a0a8bd29d03d15431b2ab5ff2b0e5755.zip |
some style fixes
Diffstat (limited to 'sesman')
-rw-r--r-- | sesman/lock.c | 34 | ||||
-rw-r--r-- | sesman/lock.h | 24 | ||||
-rw-r--r-- | sesman/thread.h | 8 |
3 files changed, 33 insertions, 33 deletions
diff --git a/sesman/lock.c b/sesman/lock.c index 4971e4c2..9aa3e621 100644 --- a/sesman/lock.c +++ b/sesman/lock.c @@ -43,7 +43,7 @@ int lock_fork_waiting_count; /* threads suspended until the fork finish sem_t lock_socket; void DEFAULT_CC -lock_init() +lock_init(void) { /* initializing socket lock */ sem_init(&lock_socket, 0, 1); @@ -51,11 +51,11 @@ lock_init() /* initializing chain lock */ pthread_mutexattr_init(&lock_chain_attr); pthread_mutex_init(&lock_chain, &lock_chain_attr); - + /* initializing config lock */ pthread_mutexattr_init(&lock_config_attr); pthread_mutex_init(&lock_config, &lock_config_attr); - + /* initializing fork lock */ pthread_mutexattr_init(&lock_fork_attr); pthread_mutex_init(&lock_chain, &lock_fork_attr); @@ -71,7 +71,7 @@ lock_init() /******************************************************************************/ void DEFAULT_CC -lock_chain_acquire() +lock_chain_acquire(void) { /*lock the chain*/ LOG_DBG("lock_chain_acquire()",0); @@ -80,7 +80,7 @@ lock_chain_acquire() /******************************************************************************/ void DEFAULT_CC -lock_chain_release() +lock_chain_release(void) { /*unlock the chain*/ LOG_DBG("lock_chain_release()",0); @@ -89,7 +89,7 @@ lock_chain_release() /******************************************************************************/ void DEFAULT_CC -lock_socket_acquire() +lock_socket_acquire(void) { /* lock socket variable */ LOG_DBG("lock_socket_acquire()",0); @@ -98,7 +98,7 @@ lock_socket_acquire() /******************************************************************************/ void DEFAULT_CC -lock_socket_release() +lock_socket_release(void) { /* unlock socket variable */ LOG_DBG("lock_socket_release()",0); @@ -107,7 +107,7 @@ lock_socket_release() /******************************************************************************/ void DEFAULT_CC -lock_fork_request() +lock_fork_request(void) { /* lock mutex */ pthread_mutex_lock(&lock_fork); @@ -118,14 +118,14 @@ lock_fork_request() } lock_fork_forkers_count++; pthread_mutex_unlock(&lock_fork); - + /* we wait to be allowed to fork() */ sem_wait(&lock_fork_req); } /******************************************************************************/ void DEFAULT_CC -lock_fork_release() +lock_fork_release(void) { pthread_mutex_lock(&lock_fork); lock_fork_forkers_count--; @@ -135,7 +135,7 @@ lock_fork_release() { sem_post(&lock_fork_req); } - + for (;lock_fork_waiting_count > 0; lock_fork_waiting_count--) { /* waking up the other processes */ @@ -156,7 +156,7 @@ lock_fork_critical_section_end(int blocking) { lock_fork_blockers_count--; } - + /* if there's someone who wants to fork and we're the last blocking */ /* then we let him go */ if ((lock_fork_blockers_count == 0) && (lock_fork_forkers_count>0)) @@ -168,22 +168,22 @@ lock_fork_critical_section_end(int blocking) /******************************************************************************/ int DEFAULT_CC -lock_fork_critical_section_start() +lock_fork_critical_section_start(void) { LOG_DBG("lock_fork_critical_secection_start()",0); do - { + { pthread_mutex_lock(&lock_fork); - + /* someone requested to fork */ if (lock_fork_forkers_count > 0) { lock_fork_waiting_count++; pthread_mutex_unlock(&lock_fork); - + /* we wait until the fork finishes */ sem_wait(&lock_fork_wait); - + } else { diff --git a/sesman/lock.h b/sesman/lock.h index 68a19f93..312bb045 100644 --- a/sesman/lock.h +++ b/sesman/lock.h @@ -31,7 +31,7 @@ * */ void DEFAULT_CC -lock_init(); +lock_init(void); /** * @@ -39,7 +39,7 @@ lock_init(); * */ void DEFAULT_CC -lock_chain_acquire(); +lock_chain_acquire(void); /** * @@ -47,7 +47,7 @@ lock_chain_acquire(); * */ void DEFAULT_CC -lock_chain_release(); +lock_chain_release(void); /** * @@ -55,7 +55,7 @@ lock_chain_release(); * */ void DEFAULT_CC -lock_cfg_acquire(); +lock_cfg_acquire(void); /** * @@ -63,7 +63,7 @@ lock_cfg_acquire(); * */ void DEFAULT_CC -lock_cfg_release(); +lock_cfg_release(void); /** * @@ -71,7 +71,7 @@ lock_cfg_release(); * */ void DEFAULT_CC -lock_socket_acquire(); +lock_socket_acquire(void); /** * @@ -79,7 +79,7 @@ lock_socket_acquire(); * */ void DEFAULT_CC -lock_socket_release(); +lock_socket_release(void); /** * @@ -87,7 +87,7 @@ lock_socket_release(); * */ void DEFAULT_CC -lock_fork_request(); +lock_fork_request(void); /** * @@ -95,21 +95,21 @@ lock_fork_request(); * */ void DEFAULT_CC -lock_fork_release(); +lock_fork_release(void); /** * * @brief starts a section that is critical for forking * - * starts a section that is critical for forking, that is noone can fork() - * while i'm in a critical section. But if someone wanted to fork we have + * starts a section that is critical for forking, that is noone can fork() + * while i'm in a critical section. But if someone wanted to fork we have * to wait until he finishes with lock_fork_release() * * @return * */ int DEFAULT_CC -lock_fork_critical_section_start(); +lock_fork_critical_section_start(void); /** * diff --git a/sesman/thread.h b/sesman/thread.h index 4807feee..aaab579c 100644 --- a/sesman/thread.h +++ b/sesman/thread.h @@ -22,7 +22,7 @@ * @file thread.h * @brief thread stuff... * @author Simone Fedele - * + * */ #ifndef THREAD_H @@ -36,7 +36,7 @@ * */ int DEFAULT_CC -thread_sighandler_start(); +thread_sighandler_start(void); /** * @@ -44,7 +44,7 @@ thread_sighandler_start(); * */ int DEFAULT_CC -thread_session_update_start(); +thread_session_update_start(void); /** * @@ -52,6 +52,6 @@ thread_session_update_start(); * */ int DEFAULT_CC -thread_scp_start(); +thread_scp_start(int skt); #endif |