Skip to content

Fix: #2419: fixed monitor queue #2420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zack-vii merged 1 commit into from
Nov 19, 2021
Merged

Fix: #2419: fixed monitor queue #2420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 14 additions & 32 deletions servershr/ServerDispatchPhase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ static inline int is_abort_in_progress()
}

static Condition JobWaitC = CONDITION_INITIALIZER;
static Condition SendMonitorC = CONDITION_INITIALIZER;

static pthread_mutex_t send_monitor_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t send_monitor_queue_cond = PTHREAD_COND_INITIALIZER;
#define MONITOR_QUEUE_LOCK MUTEX_LOCK_PUSH(&send_monitor_queue_mutex)
#define MONITOR_QUEUE_UNLOCK MUTEX_LOCK_POP(&send_monitor_queue_mutex)

Expand Down Expand Up @@ -889,13 +889,6 @@ void send_monitor_do(int mode, int idx)

static Condition SendMonitorRunningC = CONDITION_INITIALIZER;

static inline void send_monitor_signal() { CONDITION_SET(&SendMonitorC); }

static inline void send_monitor_wait()
{
CONDITION_WAIT_1SEC(&SendMonitorC);
}

static void send_monitor_push(int mode, int i)
{
SendMonitorInfo *c = malloc(sizeof(SendMonitorInfo));
Expand All @@ -908,38 +901,27 @@ static void send_monitor_push(int mode, int i)
else
SendMonitorQueueHead = c;
SendMonitorQueueTail = c;
pthread_cond_signal(&send_monitor_queue_cond);
MONITOR_QUEUE_UNLOCK;
send_monitor_signal();
}

static int send_monitor_pop(int *mode_out, int *i)
{
int idx;
int mode;
do
MONITOR_QUEUE_LOCK;
while (!SendMonitorQueueHead)
{
int release;
MONITOR_QUEUE_LOCK;
release = 1;
if (SendMonitorQueueHead)
{
SendMonitorInfo *c = SendMonitorQueueHead;
idx = SendMonitorQueueHead->idx;
mode = SendMonitorQueueHead->mode;
SendMonitorQueueHead = SendMonitorQueueHead->next;
if (!SendMonitorQueueHead)
SendMonitorQueueTail = NULL;
free(c);
}
else
{
release = pthread_mutex_unlock(&send_monitor_queue_mutex);
idx = -1;
mode = 0;
send_monitor_wait();
}
pthread_cleanup_pop(release);
} while (idx == -1);
pthread_cond_wait(&send_monitor_queue_cond, &send_monitor_queue_mutex);
}
SendMonitorInfo *c = SendMonitorQueueHead;
idx = SendMonitorQueueHead->idx;
mode = SendMonitorQueueHead->mode;
SendMonitorQueueHead = SendMonitorQueueHead->next;
free(c);
if (!SendMonitorQueueHead)
SendMonitorQueueTail = NULL;
MONITOR_QUEUE_UNLOCK;
*i = idx;
*mode_out = mode;
return B_TRUE;
Expand Down