X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=job.c;h=3d99a8f83dea8171c98979905a2d7b1d367d5693;hb=0bfa9f900af9a4f4e65f3f580056de28380b333a;hp=b7edeac9a7f06d8a66365b88e86a04e6ffc22b23;hpb=dd4df3834d9d0175c7ee4fc19061945d1968581b;p=apps%2Fpfixtools.git diff --git a/job.c b/job.c index b7edeac..3d99a8f 100644 --- a/job.c +++ b/job.c @@ -54,7 +54,6 @@ # endif #endif - #include "job.h" static int epollfd = -1; @@ -77,11 +76,11 @@ static job_t *job_register_fd(job_t *job) { struct epoll_event event = { .data.ptr = job, .events = EPOLLRDHUP }; - if (job->state & (JOB_READ | JOB_LISTEN)) { + if (job->mode & (JOB_READ | JOB_LISTEN)) { event.events |= EPOLLIN; } - if (job->state & (JOB_WRITE | JOB_CONN)) { + if (job->mode & (JOB_WRITE | JOB_CONN)) { event.events |= EPOLLOUT; } @@ -94,19 +93,19 @@ static job_t *job_register_fd(job_t *job) return job; } -void job_update_state(job_t *job, int state) +void job_update_mode(job_t *job, int mode) { struct epoll_event event = { .data.ptr = job, .events = EPOLLRDHUP }; - if (job->state == state) + if (job->mode == mode) return; - job->state = state; - if (job->state & (JOB_READ | JOB_LISTEN)) { + job->mode = mode; + if (job->mode & (JOB_READ | JOB_LISTEN)) { event.events |= EPOLLIN; } - if (job->state & (JOB_WRITE | JOB_CONN)) { + if (job->mode & (JOB_WRITE | JOB_CONN)) { event.events |= EPOLLOUT; } @@ -116,7 +115,7 @@ void job_update_state(job_t *job, int state) } } -job_t *job_accept(job_t *listener, int state) +job_t *job_accept(job_t *listener, int mode) { int sock; job_t *res; @@ -133,7 +132,7 @@ job_t *job_accept(job_t *listener, int state) res = job_new(); res->fd = sock; - res->state = state; + res->mode = mode; res->process = listener->process; res->stop = listener->stop; return job_register_fd(res);