hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added modopen()/modclose()/modsym() to Awk/StdAwk.

Browse Source 
migrated /lib/awk/mpi.c to mod/awk/mpi.c partially
This commit is contained in:
hyung-hwan
2012-10-31 13:51:32 +00:00
parent 65c324d373
commit acb40dea35
14 changed files with 507 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qse/cmd/awk/Makefile.am
View File

@ -19,20 +19,3 @@ qseawk_LDADD += $(UNICOWS_LIBS)
endif
endif
#####################################################################3
if HAVE_C_MPI
bin_PROGRAMS += qseawkmp
qseawkmp_SOURCES = mpi.c
qseawkmp_CPPFLAGS = $(AM_CPPFLAGS) $(MPI_CFLAGS)
qseawkmp_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir) $(MPI_CLDFLAGS)
qseawkmp_LDADD = -lqseawkmp -lqseawk -lqsecmn $(LIBM)
if WIN32
if WCHAR
qseawkmp_LDADD += $(UNICOWS_LIBS)
endif
endif
endif

43
qse/cmd/awk/Makefile.in
View File

@ -34,12 +34,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = qseawk$(EXEEXT) $(am__EXEEXT_1)
bin_PROGRAMS = qseawk$(EXEEXT)
@WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
#####################################################################3
@HAVE_C_MPI_TRUE@am__append_2 = qseawkmp
@HAVE_C_MPI_TRUE@@WCHAR_TRUE@@WIN32_TRUE@am__append_3 = $(UNICOWS_LIBS)
subdir = cmd/awk
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -55,7 +51,6 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/qse/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@HAVE_C_MPI_TRUE@am__EXEEXT_1 = qseawkmp$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_qseawk_OBJECTS = awk.$(OBJEXT)
@ -66,15 +61,6 @@ qseawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
qseawk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qseawk_LDFLAGS) \
$(LDFLAGS) -o $@
am__qseawkmp_SOURCES_DIST = mpi.c
@HAVE_C_MPI_TRUE@am_qseawkmp_OBJECTS = qseawkmp-mpi.$(OBJEXT)
qseawkmp_OBJECTS = $(am_qseawkmp_OBJECTS)
@HAVE_C_MPI_TRUE@@WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
@HAVE_C_MPI_TRUE@qseawkmp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@HAVE_C_MPI_TRUE@ $(am__DEPENDENCIES_3)
qseawkmp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qseawkmp_LDFLAGS) \
$(LDFLAGS) -o $@
DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__depfiles_maybe = depfiles
@ -88,8 +74,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(qseawk_SOURCES) $(qseawkmp_SOURCES)
DIST_SOURCES = $(qseawk_SOURCES) $(am__qseawkmp_SOURCES_DIST)
SOURCES = $(qseawk_SOURCES)
DIST_SOURCES = $(qseawk_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -273,11 +259,6 @@ AM_CPPFLAGS = \
qseawk_SOURCES = awk.c
qseawk_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir)
qseawk_LDADD = -lqseawk -lqsecmn $(LIBM) $(am__append_1)
@HAVE_C_MPI_TRUE@qseawkmp_SOURCES = mpi.c
@HAVE_C_MPI_TRUE@qseawkmp_CPPFLAGS = $(AM_CPPFLAGS) $(MPI_CFLAGS)
@HAVE_C_MPI_TRUE@qseawkmp_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir) $(MPI_CLDFLAGS)
@HAVE_C_MPI_TRUE@qseawkmp_LDADD = -lqseawkmp -lqseawk -lqsecmn $(LIBM) \
@HAVE_C_MPI_TRUE@ $(am__append_3)
all: all-am
.SUFFIXES:
@ -358,9 +339,6 @@ clean-binPROGRAMS:
qseawk$(EXEEXT): $(qseawk_OBJECTS) $(qseawk_DEPENDENCIES) $(EXTRA_qseawk_DEPENDENCIES)
@rm -f qseawk$(EXEEXT)
$(qseawk_LINK) $(qseawk_OBJECTS) $(qseawk_LDADD) $(LIBS)
qseawkmp$(EXEEXT): $(qseawkmp_OBJECTS) $(qseawkmp_DEPENDENCIES) $(EXTRA_qseawkmp_DEPENDENCIES)
@rm -f qseawkmp$(EXEEXT)
$(qseawkmp_LINK) $(qseawkmp_OBJECTS) $(qseawkmp_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@ -369,7 +347,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/awk.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qseawkmp-mpi.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@ -392,20 +369,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
qseawkmp-mpi.o: mpi.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(qseawkmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qseawkmp-mpi.o -MD -MP -MF $(DEPDIR)/qseawkmp-mpi.Tpo -c -o qseawkmp-mpi.o `test -f 'mpi.c' || echo '$(srcdir)/'`mpi.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/qseawkmp-mpi.Tpo $(DEPDIR)/qseawkmp-mpi.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpi.c' object='qseawkmp-mpi.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(qseawkmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qseawkmp-mpi.o `test -f 'mpi.c' || echo '$(srcdir)/'`mpi.c
qseawkmp-mpi.obj: mpi.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(qseawkmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qseawkmp-mpi.obj -MD -MP -MF $(DEPDIR)/qseawkmp-mpi.Tpo -c -o qseawkmp-mpi.obj `if test -f 'mpi.c'; then $(CYGPATH_W) 'mpi.c'; else $(CYGPATH_W) '$(srcdir)/mpi.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/qseawkmp-mpi.Tpo $(DEPDIR)/qseawkmp-mpi.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpi.c' object='qseawkmp-mpi.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(qseawkmp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qseawkmp-mpi.obj `if test -f 'mpi.c'; then $(CYGPATH_W) 'mpi.c'; else $(CYGPATH_W) '$(srcdir)/mpi.c'; fi`
mostlyclean-libtool:
-rm -f *.lo

23
qse/cmd/awk/awk.c
View File

@ -58,10 +58,6 @@
# define USE_LTDL
#endif
#if defined(ENABLE_MPI)
# include <mpi.h>
#endif
static qse_awk_rtx_t* app_rtx = QSE_NULL;
static int app_debug = 0;
@ -1166,20 +1162,6 @@ int qse_main (int argc, qse_achar_t* argv[])
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
#endif
#if defined(ENABLE_MPI)
/* I didn't manage to find a good way to change the
* default error handler to MPI_ERRORS_RETURN.
* so MPI_Init() will simply abort the program if it fails */
if (MPI_Init (&argc, &argv) != MPI_SUCCESS)
{
print_error (QSE_T("Failed to initialize MPI\n"));
ret = -1;
goto oops;
}
MPI_Comm_set_errhandler (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
#endif
#if defined(USE_LTDL)
lt_dlinit ();
#endif
@ -1190,11 +1172,6 @@ int qse_main (int argc, qse_achar_t* argv[])
lt_dlexit ();
#endif
#if defined(ENABLE_MPI)
MPI_Finalize ();
oops:
#endif
#if defined(_WIN32)
WSACleanup ();
#endif

14
qse/cmd/awk/mpi.c
View File

@ -1,14 +0,0 @@
#define ENABLE_MPI
#define qse_awk_openstd qse_awk_openmpi
#define qse_awk_openstdwithmmgr qse_awk_openmpiwithmmgr
#define qse_awk_getxtnstd qse_awk_getxtnmpi
#define qse_awk_parsestd qse_awk_parsempi
#define qse_awk_rtx_openstd qse_awk_rtx_openmpi
#define qse_awk_rtx_getxtnstd qse_awk_rtx_getxtnmpi
#define qse_awk_rtx_getcmgrstd qse_awk_rtx_getcmgrmpi
#include "awk.c"