Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add CallWithTimeout and related. #331

Merged
merged 4 commits into from
Nov 17, 2015
Merged

Add CallWithTimeout and related. #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bd275a
Introduce CallWithTimeout and CallWithTimeoutList and support functions.
stevelinton Oct 29, 2015
67a2800
Documentation and a test file
stevelinton Nov 4, 2015
730ec9e
Fix a number of minor bugs and improve robustness
stevelinton Nov 4, 2015
3ac7ce3
Fix for Cygwin as a far as Cygwin allows
stevelinton Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@ extern: config
MAKE_GMP='$(MAKE_GMP)' \
CONFIGNAME='$(CONFIGNAME)' )

compile: extern
bin/$(GAPARCH)/gap_version.h:
cnf/mkversionheader.sh bin/$(GAPARCH)/gap_version.h

compile: extern bin/$(GAPARCH)/gap_version.h
( cd bin/$(GAPARCH); \
$(MAKE) \
ABI='$(ABI)' \
Expand Down
2 changes: 1 addition & 1 deletion cnf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Makegap.in: Makegap.top Makefile Makegap.bottom
@echo >> Makegap.in
@echo '# compile and link GAP' >> Makegap.in
@echo 'gap: $$(OBJECTS) $$(ITANIUMOBJ) $$(EXTOBJS)' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap $$(OBJECTS) $$(ITANIUMOBJ) -lm $$(MPILIBS) $$(EXTOBJS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap $$(OBJECTS) $$(ITANIUMOBJ) -lm -lrt $$(MPILIBS) $$(EXTOBJS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
@echo >> Makegap.in
@echo '# compile and link gap.dll on cygwin' >> Makegap.in
@echo 'gapdll: $$(OBJECTS) $$(ITANIUMOBJ) $$(EXTOBJS)' >> Makegap.in
Expand Down
5 changes: 3 additions & 2 deletions cnf/Makegap.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ OBJECTS=ariths.o blister.o bool.o c_filt1.o c_meths1.o c_oper1.o c_random.o c_ty

# compile and link GAP
gap: $(OBJECTS) $(ITANIUMOBJ) $(EXTOBJS)
$(CC) $(LDFLAGS) -o gap $(OBJECTS) $(ITANIUMOBJ) -lm $(MPILIBS) $(EXTOBJS) $(GMP_LIBS) $(CONFLIBS)
$(CC) $(LDFLAGS) -o gap $(OBJECTS) $(ITANIUMOBJ) -lm $(MPILIBS) $(EXTOBJS) $(GMP_LIBS) $(CONFLIBS)

# compile and link gap.dll on cygwin
gapdll: $(OBJECTS) $(ITANIUMOBJ) $(EXTOBJS)
Expand Down Expand Up @@ -262,7 +262,8 @@ gap.o: ../../Makefile @srcdir@/gap.c @srcdir@/system.h config.h @srcdir@/gasman.
$(CC) $(CPPFLAGS) $(GMP_CFLAGS) $(CFLAGS) -o gap.o -c @srcdir@/gap.c

gasman.o: ../../Makefile @srcdir@/gasman.c @srcdir@/system.h config.h @srcdir@/gasman.h \
@srcdir@/atomic.h @srcdir@/objects.h @srcdir@/scanner.h
@srcdir@/atomic.h @srcdir@/objects.h @srcdir@/scanner.h @srcdir@/code.h \
@srcdir@/thread.h @srcdir@/tls.h
$(CC) $(CPPFLAGS) $(GMP_CFLAGS) $(CFLAGS) -o gasman.o -c @srcdir@/gasman.c

gmpints.o: ../../Makefile @srcdir@/gmpints.c @srcdir@/system.h config.h @srcdir@/gasman.h \
Expand Down
36 changes: 36 additions & 0 deletions cnf/config.hin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
/* Define to 1 if you have the `fstat' function. */
#undef HAVE_FSTAT

/* Define to 1 if you have the `getitimer' function. */
#undef HAVE_GETITIMER

/* Define to 1 if you have the `getpseudotty' function. */
#undef HAVE_GETPSEUDOTTY

Expand All @@ -101,6 +104,9 @@
/* Define to 1 if you have the `readline' library (-lreadline). */
#undef HAVE_LIBREADLINE

/* Define to 1 if you have the `rt' library (-lrt). */
#undef HAVE_LIBRT

/* Define to 1 if you have the <libutil.h> header file. */
#undef HAVE_LIBUTIL_H

Expand Down Expand Up @@ -194,12 +200,18 @@
/* Define to 1 if you have the `send' function. */
#undef HAVE_SEND

/* Define to 1 if you have the `setitimer' function. */
#undef HAVE_SETITIMER

/* Define to 1 if you have the `setpgid' function. */
#undef HAVE_SETPGID

/* Define to 1 if you have the <sgtty.h> header file. */
#undef HAVE_SGTTY_H

/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION

/* Define to 1 if you have the `signal' function. */
#undef HAVE_SIGNAL

Expand All @@ -209,6 +221,9 @@
/* Define to 1 if you have the `sigsetjmp' function. */
#undef HAVE_SIGSETJMP

/* Check for sig_atomic_t */
#undef HAVE_SIG_ATOMIC_T

/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET

Expand Down Expand Up @@ -265,6 +280,15 @@
/* Define to 1 if you have the <sys/sysmacros.h> header file. */
#undef HAVE_SYS_SYSMACROS_H

/* Define to 1 if you have the `sys_timer_create' function. */
#undef HAVE_SYS_TIMER_CREATE

/* Define to 1 if you have the `sys_timer_gettime' function. */
#undef HAVE_SYS_TIMER_GETTIME

/* Define to 1 if you have the `sys_timer_settime' function. */
#undef HAVE_SYS_TIMER_SETTIME

/* Define to 1 if you have the <sys/times.h> header file. */
#undef HAVE_SYS_TIMES_H

Expand All @@ -283,9 +307,21 @@
/* Define to 1 if you have the <termio.h> header file. */
#undef HAVE_TERMIO_H

/* Define to 1 if you have the `timer_create' function. */
#undef HAVE_TIMER_CREATE

/* Define to 1 if you have the `timer_gettime' function. */
#undef HAVE_TIMER_GETTIME

/* Define to 1 if you have the `timer_settime' function. */
#undef HAVE_TIMER_SETTIME

/* Define to 1 if you have the `times' function. */
#undef HAVE_TIMES

/* Define to 1 if you have the <time.h> header file. */
#undef HAVE_TIME_H

/* Define to 1 if you have the `trunc' function. */
#undef HAVE_TRUNC

Expand Down
13 changes: 10 additions & 3 deletions cnf/configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ AC_HEADER_STDC

AC_CHECK_HEADERS( assert.h errno.h math.h stdio.h stdlib.h string.h )
AC_CHECK_HEADERS( termios.h termio.h sgtty.h signal.h unistd.h sys/stat.h )
AC_CHECK_HEADERS( fcntl.h sys/ioctl.h sys/time.h sys/types.h sys/sysmacros.h sys/resource.h )
AC_CHECK_TYPE( sig_atomic_t, [], [ AC_DEFINE([HAVE_SIG_ATOMIC_T],[],[Check for sig_atomic_t]) ],[#include <signal.h>])
AC_CHECK_HEADERS( fcntl.h sys/ioctl.h time.h sys/time.h sys/types.h sys/sysmacros.h sys/resource.h )

dnl #########################################################################
dnl ##
Expand Down Expand Up @@ -143,8 +144,14 @@ dnl ##
dnl ## check for timing functions
dnl ##

AC_CHECK_HEADERS( sys/times.h sys/param.h )
AC_CHECK_HEADERS( time.h sys/times.h sys/param.h )
AC_CHECK_FUNCS( times getrusage gettimeofday )
AC_CHECK_FUNCS( setitimer getitimer)
AC_CHECK_LIB( [rt], [timer_create])
AC_CHECK_FUNCS( timer_settime timer_gettime timer_create )
AC_CHECK_FUNCS( sys_timer_settime sys_timer_gettime sys_timer_create )




dnl #########################################################################
Expand Down Expand Up @@ -194,7 +201,7 @@ dnl ##
dnl ## check for signal handling
dnl ##

AC_CHECK_FUNCS( signal )
AC_CHECK_FUNCS( signal sigaction)


dnl #########################################################################
Expand Down
Loading