1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Indent critical regions with blocks

Browse Source 
Cosmetic change per ko1's preference
This commit is contained in:
Yusuke Endoh 2023-10-19 14:14:31 +09:00
parent acd774263c
commit c08020254e
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ext/socket/raddrinfo.c
View File

@ -418,15 +418,17 @@ do_getaddrinfo(void *ptr)
int need_free = 0; int need_free = 0;
rb_nativethread_lock_lock(&arg->lock); rb_nativethread_lock_lock(&arg->lock);
arg->err = err; {
if (arg->cancelled) { arg->err = err;
freeaddrinfo(arg->ai); if (arg->cancelled) {
freeaddrinfo(arg->ai);
}
else {
arg->done = 1;
rb_native_cond_signal(&arg->cond);
}
if (--arg->refcount == 0) need_free = 1;
} }
else {
arg->done = 1;
rb_native_cond_signal(&arg->cond);
}
if (--arg->refcount == 0) need_free = 1;
rb_nativethread_lock_unlock(&arg->lock); rb_nativethread_lock_unlock(&arg->lock);
if (need_free) free_getaddrinfo_arg(arg); if (need_free) free_getaddrinfo_arg(arg);
@ -451,8 +453,10 @@ cancel_getaddrinfo(void *ptr)
{ {
struct getaddrinfo_arg *arg = (struct getaddrinfo_arg *)ptr; struct getaddrinfo_arg *arg = (struct getaddrinfo_arg *)ptr;
rb_nativethread_lock_lock(&arg->lock); rb_nativethread_lock_lock(&arg->lock);
arg->cancelled = 1; {
rb_native_cond_signal(&arg->cond); arg->cancelled = 1;
rb_native_cond_signal(&arg->cond);
}
rb_nativethread_lock_unlock(&arg->lock); rb_nativethread_lock_unlock(&arg->lock);
} }
@ -489,20 +493,22 @@ start:
int need_free = 0; int need_free = 0;
rb_nativethread_lock_lock(&arg->lock); rb_nativethread_lock_lock(&arg->lock);
if (arg->done) { {
err = arg->err; if (arg->done) {
if (err == 0) *ai = arg->ai; err = arg->err;
if (err == 0) *ai = arg->ai;
}
else if (arg->cancelled) {
err = EAGAIN;
}
else {
// If already interrupted, rb_thread_call_without_gvl2 may return without calling wait_getaddrinfo.
// In this case, it could be !arg->done && !arg->cancelled.
arg->cancelled = 1; // to make do_getaddrinfo call freeaddrinfo
retry = 1;
}
if (--arg->refcount == 0) need_free = 1;
} }
else if (arg->cancelled) {
err = EAGAIN;
}
else {
// If already interrupted, rb_thread_call_without_gvl2 may return without calling wait_getaddrinfo.
// In this case, it could be !arg->done && !arg->cancelled.
arg->cancelled = 1; // to make do_getaddrinfo call freeaddrinfo
retry = 1;
}
if (--arg->refcount == 0) need_free = 1;
rb_nativethread_lock_unlock(&arg->lock); rb_nativethread_lock_unlock(&arg->lock);
if (need_free) free_getaddrinfo_arg(arg); if (need_free) free_getaddrinfo_arg(arg);