mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proper return value handling

Browse Source
This commit is contained in:
leitner 2024-04-05 17:37:38 +00:00
parent cf112a57fa
commit 6f8e168ae3
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
io/iom_wait.c
View File

@ -175,23 +175,36 @@ int iom_wait(iomux_t* c,int64* s,unsigned int* revents,unsigned long timeout) {
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
tv.tv_sec += timeout/1000; tv.tv_sec += timeout/1000;
tv.tv_usec += timeout%1000; tv.tv_usec += timeout%1000;
if (tv.tv_usec>1000) { if (tv.tv_usec>1000000) {
tv.tv_usec-=1000; tv.tv_usec-=1000000;
++tv.tv_sec; ++tv.tv_sec;
} }
ts.tv_sec = tv.tv_sec; ts.tv_sec = tv.tv_sec;
ts.tv_nsec = tv.tv_usec * 1000; ts.tv_nsec = tv.tv_usec * 1000;
#ifdef __dietlibc__ #ifdef __dietlibc__
r=cnd_timedwait(&c->sem,&c->mtx,&ts); r=cnd_timedwait(&c->sem,&c->mtx,&ts);
switch (r) {
case thrd_success:
continue;
case thrd_timedout:
return 0;
case thrd_error:
return -1;
}
#elif defined(__APPLE__) #elif defined(__APPLE__)
r=pthread_cond_timedwait(&c->sem,&c->mtx,&ts); r=pthread_cond_timedwait(&c->sem,&c->mtx,&ts);
switch (r) {
case 0: continue;
case ETIMEDOUT: return 0;
default: return -1;
}
#else #else
r=sem_timedwait(&c->sem,&ts); r=sem_timedwait(&c->sem,&ts);
#endif
if (r==-1) { if (r==-1) {
if (errno==ETIMEDOUT) return 0; if (errno==ETIMEDOUT) return 0;
return -1; return -1;
} }
#endif
/* fall through into next loop iteration */ /* fall through into next loop iteration */
} }
} }

9
test/iom.c
View File

@ -14,7 +14,7 @@ int worker(void* arg) {
uintptr_t i=(uintptr_t)arg; uintptr_t i=(uintptr_t)arg;
char buf[100]; char buf[100];
int64 s; int64 s;
int events; unsigned int events;
write(1,buf,sprintf(buf,"starting thread %ld\n",i)); write(1,buf,sprintf(buf,"starting thread %ld\n",i));
@ -73,7 +73,10 @@ int main() {
if (thrd_join(x[i],&r)==-1) if (thrd_join(x[i],&r)==-1)
#else #else
void* tmp; void* tmp;
if (pthread_join(x[i],&tmp)==-1, r=(int)(uintptr_t)tmp)
if (pthread_join(x[i],&tmp)!=-1)
r=(int)(uintptr_t)tmp;
else
#endif #endif
{ {
perror("thrd_join"); perror("thrd_join");
@ -82,5 +85,7 @@ int main() {
printf("thread %d returned %d\n",i,r); printf("thread %d returned %d\n",i,r);
} }
fflush(stdout);
return 0; return 0;
} }