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

Use pthread_attr_setaffinity_np instead of pthread_setaffinity_np

Browse Source
This commit is contained in:
Yusuke Endoh 2023-11-06 20:48:14 +09:00
parent d0066211f2
commit dc636fec2a
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/socket/extconf.rb
View File

@ -704,7 +704,7 @@ SRC
have_func("pthread_create") have_func("pthread_create")
have_func("pthread_detach") have_func("pthread_detach")
have_func("pthread_setaffinity_np") have_func("pthread_attr_setaffinity_np")
have_func("sched_getcpu") have_func("sched_getcpu")
$VPATH << '$(topdir)' << '$(top_srcdir)' $VPATH << '$(topdir)' << '$(top_srcdir)'

34
ext/socket/raddrinfo.c
View File

@ -475,18 +475,23 @@ start:
return EAI_MEMORY; return EAI_MEMORY;
} }
pthread_t th; pthread_attr_t attr;
if (pthread_create(&th, 0, do_getaddrinfo, arg) != 0) { if (pthread_attr_init(&attr) != 0) {
free_getaddrinfo_arg(arg); free_getaddrinfo_arg(arg);
return EAI_AGAIN; return EAI_AGAIN;
} }
#if defined(HAVE_PTHREAD_ATTR_SETAFFINITY_NP) && defined(HAVE_SCHED_GETCPU)
#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(HAVE_SCHED_GETCPU)
cpu_set_t tmp_cpu_set; cpu_set_t tmp_cpu_set;
CPU_ZERO(&tmp_cpu_set); CPU_ZERO(&tmp_cpu_set);
CPU_SET(sched_getcpu(), &tmp_cpu_set); CPU_SET(sched_getcpu(), &tmp_cpu_set);
pthread_setaffinity_np(th, sizeof(cpu_set_t), &tmp_cpu_set); pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &tmp_cpu_set);
#endif #endif
pthread_t th;
if (pthread_create(&th, &attr, do_getaddrinfo, arg) != 0) {
free_getaddrinfo_arg(arg);
return EAI_AGAIN;
}
pthread_detach(th); pthread_detach(th);
rb_thread_call_without_gvl2(wait_getaddrinfo, arg, cancel_getaddrinfo, arg); rb_thread_call_without_gvl2(wait_getaddrinfo, arg, cancel_getaddrinfo, arg);
@ -694,18 +699,23 @@ start:
return EAI_MEMORY; return EAI_MEMORY;
} }
pthread_attr_t attr;
if (pthread_attr_init(&attr) != 0) {
free_getnameinfo_arg(arg);
return EAI_AGAIN;
}
#if defined(HAVE_PTHREAD_ATTR_SETAFFINITY_NP) && defined(HAVE_SCHED_GETCPU)
cpu_set_t tmp_cpu_set;
CPU_ZERO(&tmp_cpu_set);
CPU_SET(sched_getcpu(), &tmp_cpu_set);
pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &tmp_cpu_set);
#endif
pthread_t th; pthread_t th;
if (pthread_create(&th, 0, do_getnameinfo, arg) != 0) { if (pthread_create(&th, 0, do_getnameinfo, arg) != 0) {
free_getnameinfo_arg(arg); free_getnameinfo_arg(arg);
return EAI_AGAIN; return EAI_AGAIN;
} }
#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(HAVE_SCHED_GETCPU)
cpu_set_t tmp_cpu_set;
CPU_ZERO(&tmp_cpu_set);
CPU_SET(sched_getcpu(), &tmp_cpu_set);
pthread_setaffinity_np(th, sizeof(cpu_set_t), &tmp_cpu_set);
#endif
pthread_detach(th); pthread_detach(th);
rb_thread_call_without_gvl2(wait_getnameinfo, arg, cancel_getnameinfo, arg); rb_thread_call_without_gvl2(wait_getnameinfo, arg, cancel_getnameinfo, arg);