kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in: check qsort_r(3) and whether it is GNU version.

Browse source 
BSD version has different prototype.

* util.h: use qsort_r() as ruby_qsort() if it is GNU version.

* util.c: define ruby_qsort() if needed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2014-02-08 12:50:28 +00:00
parent c7652dec6f
commit cd476cd86b
4 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Sat Feb 8 21:44:07 2014 Masaki Matsushita <glass.saga@gmail.com>
* configure.in: check qsort_r(3) and whether it is GNU version.
BSD version has different prototype.
* util.h: use qsort_r() as ruby_qsort() if it is GNU version.
* util.c: define ruby_qsort() if needed.
Sat Feb 8 16:34:36 2014 Tanaka Akira <akr@fsij.org> Sat Feb 8 16:34:36 2014 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#get_labels): * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#get_labels):

34
configure.in
View file

@ -1920,6 +1920,7 @@ AC_CHECK_FUNCS(posix_fadvise)
AC_CHECK_FUNCS(posix_memalign) AC_CHECK_FUNCS(posix_memalign)
AC_CHECK_FUNCS(ppoll) AC_CHECK_FUNCS(ppoll)
AC_CHECK_FUNCS(pread) AC_CHECK_FUNCS(pread)
AC_CHECK_FUNCS(qsort_r)
AC_CHECK_FUNCS(readlink) AC_CHECK_FUNCS(readlink)
AC_CHECK_FUNCS(round) AC_CHECK_FUNCS(round)
AC_CHECK_FUNCS(seekdir) AC_CHECK_FUNCS(seekdir)
@ -1980,6 +1981,39 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [__builtin_choose_expr(0, 0, 0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [__builtin_choose_expr(0, 0, 0)])
RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)])
if test "$ac_cv_func_qsort_r" != no; then
AC_CACHE_CHECK(that qsort_r is GNU version, rb_cv_gnu_qsort_r,
[AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <stdlib.h>
int unsorted[] = { 4, 3, 2, 1 };
int sorted[] = { 1, 2, 3, 4 };
int
compar(const void *a, const void *b, void *arg)
{
if (*(int *)arg != 42) exit(1);
return *(int *)a - *(int *)b;
}
int
main(void)
{
int arg = 42;
qsort_r(unsorted, 4, sizeof(int), compar, &arg);
if (memcmp(sorted, unsorted, 4) != 0) return 1;
return 0;
}
]])],
[rb_cv_gnu_qsort_r=yes],
[rb_cv_gnu_qsort_r=no])
])
if test "$rb_cv_gnu_qsort_r" != no; then
AC_DEFINE(HAVE_GNU_QSORT_R, 1)
fi
fi
# Some platform need -lrt for clock_gettime, but the other don't. # Some platform need -lrt for clock_gettime, but the other don't.
if test x"$ac_cv_func_clock_gettime" != xyes; then if test x"$ac_cv_func_clock_gettime" != xyes; then
# glibc 2.17 moves clock_* functions from librt to the main C library. # glibc 2.17 moves clock_* functions from librt to the main C library.

4
include/ruby/util.h
View file

@ -55,8 +55,12 @@ unsigned long ruby_scan_oct(const char *, size_t, size_t *);
#define scan_hex(s,l,e) ((int)ruby_scan_hex((s),(l),(e))) #define scan_hex(s,l,e) ((int)ruby_scan_hex((s),(l),(e)))
unsigned long ruby_scan_hex(const char *, size_t, size_t *); unsigned long ruby_scan_hex(const char *, size_t, size_t *);
#ifdef HAVE_GNU_QSORT_R
# define ruby_qsort qsort_r
#else
void ruby_qsort(void *, const size_t, const size_t, void ruby_qsort(void *, const size_t, const size_t,
int (*)(const void *, const void *, void *), void *); int (*)(const void *, const void *, void *), void *);
#endif
void ruby_setenv(const char *, const char *); void ruby_setenv(const char *, const char *);
void ruby_unsetenv(const char *); void ruby_unsetenv(const char *);

2
util.c
View file

@ -186,6 +186,7 @@ ruby_strtoul(const char *str, char **endptr, int base)
#endif #endif
#ifndef HAVE_GNU_QSORT_R
/* mm.c */ /* mm.c */
#define mmtype long #define mmtype long
@ -452,6 +453,7 @@ ruby_qsort(void* base, const size_t nel, const size_t size, cmpfunc_t *cmp, void
else goto nxt; /* need not to sort both sides */ else goto nxt; /* need not to sort both sides */
} }
} }
#endif /* HAVE_GNU_QSORT_R */
char * char *
ruby_strdup(const char *str) ruby_strdup(const char *str)