[Spread-cvs] commit: r564 - in trunk/libspread-util: . src
jonathan at spread.org
jonathan at spread.org
Wed Mar 27 23:39:11 EDT 2013
Author: jonathan
Date: 2013-03-27 23:39:11 -0400 (Wed, 27 Mar 2013)
New Revision: 564
Modified:
trunk/libspread-util/Changelog
trunk/libspread-util/configure
trunk/libspread-util/configure.in
trunk/libspread-util/src/alarm.c
trunk/libspread-util/src/arch.h
trunk/libspread-util/src/events.c
Log:
Merge updates from libspreadutil from 4.2.0rc1 release until current trunk at r563
Modified: trunk/libspread-util/Changelog
===================================================================
--- trunk/libspread-util/Changelog 2013-03-28 03:30:00 UTC (rev 563)
+++ trunk/libspread-util/Changelog 2013-03-28 03:39:11 UTC (rev 564)
@@ -1,3 +1,16 @@
+Wed Mar 27 23:27:08 2013 Jonathan Stanton <jonathan at spreadconcepts.com>
+
+ * configure.in: Change test for clock_gettime(CLOCK_MONOTONIC) to runtime test from compile test.
+
+Wed Mar 27 22:51:12 2013 Jonathan Stanton <jonathan at spreadconcepts.com>
+
+ * arch.h, src/events.c, src/alarm.c: Windows portability fixes provided by Juan Pizzorno.
+
+Tue Mar 12 07:08:28 2013 Jonathan Stanton <jonathan at spreadconcepts.com>
+
+ * src/events.c (E_attach_fd): Change Alarm priority from PRINT to EVENTS so non-error FD attach
+ does not log every time.
+
Mon Jun 18 13:24:41 2012 Jonathan Stanton <jonathan at spreadconcepts.com>
* src/data_link.c (DL_init_channel): Fix DL_init_channels algorithm for selecting which
Modified: trunk/libspread-util/configure
===================================================================
--- trunk/libspread-util/configure 2013-03-28 03:30:00 UTC (rev 563)
+++ trunk/libspread-util/configure 2013-03-28 03:39:11 UTC (rev 564)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Spread_Util 4.2.0.
+# Generated by GNU Autoconf 2.62 for Spread_Util 4.3.0.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
# Identity of this package.
PACKAGE_NAME='Spread_Util'
PACKAGE_TARNAME='spread_util'
-PACKAGE_VERSION='4.2.0'
-PACKAGE_STRING='Spread_Util 4.2.0'
+PACKAGE_VERSION='4.3.0'
+PACKAGE_STRING='Spread_Util 4.3.0'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -777,7 +777,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Spread_Util 4.2.0 to adapt to many kinds of systems.
+\`configure' configures Spread_Util 4.3.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -838,7 +838,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Spread_Util 4.2.0:";;
+ short | recursive ) echo "Configuration of Spread_Util 4.3.0:";;
esac
cat <<\_ACEOF
@@ -967,8 +967,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Spread_Util configure 4.2.0
-generated by GNU Autoconf 2.59
+Spread_Util configure 4.3.0
+generated by GNU Autoconf 2.62
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -981,8 +981,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Spread_Util $as_me 4.2.0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+It was created by Spread_Util $as_me 4.3.0, which was
+generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -4906,9 +4906,9 @@
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+$as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -4922,29 +4922,43 @@
int main() { struct timespec t; return clock_gettime(CLOCK_MONOTONIC, &t); }
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_clock_gettime_monotonic="yes"
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_clock_gettime_monotonic="no"
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
echo "$as_me:$LINENO: result: $ac_cv_clock_gettime_monotonic" >&5
echo "${ECHO_T}$ac_cv_clock_gettime_monotonic" >&6
@@ -9956,17 +9970,12 @@
# Open the log real soon, to keep \$[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
+# values after options handling.
+ac_log="
+This file was extended by Spread_Util $as_me 4.3.0, which was
+generated by GNU Autoconf 2.62. Invocation command line was
-This file was extended by Spread_Util $as_me 4.2.0, which was
+This file was extended by Spread_Util $as_me 4.3.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10026,9 +10035,9 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Spread_Util config.status 4.2.0
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+Spread_Util config.status 4.3.0
+configured by $0, generated by GNU Autoconf 2.62,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
Modified: trunk/libspread-util/configure.in
===================================================================
--- trunk/libspread-util/configure.in 2013-03-28 03:30:00 UTC (rev 563)
+++ trunk/libspread-util/configure.in 2013-03-28 03:39:11 UTC (rev 564)
@@ -1,4 +1,4 @@
-AC_INIT(Spread_Util, 4.2.0)
+AC_INIT(Spread_Util, 4.3.0)
AC_CONFIG_AUX_DIR(buildtools)
AC_CONFIG_HEADERS(src/config.h)
Modified: trunk/libspread-util/src/alarm.c
===================================================================
--- trunk/libspread-util/src/alarm.c 2013-03-28 03:30:00 UTC (rev 563)
+++ trunk/libspread-util/src/alarm.c 2013-03-28 03:39:11 UTC (rev 564)
@@ -45,6 +45,10 @@
# undef EAGAIN
# undef EWOULDBLOCK
# undef EINPROGRESS
+# undef EALREADY
+# ifndef va_copy
+# define va_copy(d,s) (d) = (s)
+# endif
#endif
#include <errno.h>
@@ -249,7 +253,9 @@
#ifndef USE_THREADED_ALARM
fprintf(stdout, "Exit caused by Alarm(EXIT)\n");
+#ifndef ARCH_PC_WIN95
abort();
+#endif
exit(0);
#else
Threaded_Alarm_Exit();
@@ -326,7 +332,9 @@
if ( EXIT & mask )
{
printf("Exit caused by Alarm(EXIT)\n");
+#ifndef ARCH_PC_WIN95
abort();
+#endif
exit( 0 );
}
}
@@ -698,7 +706,9 @@
}
fprintf(stdout, "Exit caused by Alarm(EXIT)\n");
+#ifndef ARCH_PC_WIN95
abort();
+#endif
exit(0);
}
}
Modified: trunk/libspread-util/src/arch.h
===================================================================
--- trunk/libspread-util/src/arch.h 2013-03-28 03:30:00 UTC (rev 563)
+++ trunk/libspread-util/src/arch.h 2013-03-28 03:39:11 UTC (rev 564)
@@ -124,8 +124,6 @@
#define ARCH_SCATTER_NONE
#define ARCH_ENDIAN 0x80000080
#define LOC_INLINE
-typedef unsigned long sockopt_len_t;
-typedef unsigned long socklen_t;
#define BADCLOCK
#define HAVE_GOOD_VARGS
/* Windows now has a strerror function and if we do not use it
@@ -146,6 +144,12 @@
* can be raised by defining a larger constant before including windows.h winsock.h
*/
#define FD_SETSIZE 1024
+
+#include <ws2tcpip.h> /* after definition of FD_SETSIZE! */
+
+#define HAVE_SOCKLEN_T 1
+typedef int sockopt_len_t;
+
/* System location of spread.conf file */
#define SPREAD_ETCDIR "/etc"
/* Use winsock constants since we are dealing with sockets
Modified: trunk/libspread-util/src/events.c
===================================================================
--- trunk/libspread-util/src/events.c 2013-03-28 03:30:00 UTC (rev 563)
+++ trunk/libspread-util/src/events.c 2013-03-28 03:39:11 UTC (rev 564)
@@ -44,6 +44,7 @@
#undef EAGAIN
#undef EWOULDBLOCK
#undef EINPROGRESS
+#undef EALREADY
#endif
#include <errno.h>
@@ -587,7 +588,8 @@
if ( !(Fd_queue[priority].events[j].active) )
Fd_queue[priority].num_active_fds++;
Fd_queue[priority].events[j].active = TRUE;
- Alarm( EVENTS, "E_attach_fd: fd %d with type %d exists & replaced & activated\n", fd, fd_type );
+ Alarm( EVENTS,
+ "E_attach_fd: fd %d with type %d exists & replaced & activated\n", fd, fd_type );
return( 1 );
}
}
More information about the Spread-cvs
mailing list