libimdb-commit Mailing List for libimdb
Status: Pre-Alpha
Brought to you by:
jveldhuis
Menu
▾
▴
libimdb-commit — cvs commit notifications
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(35) |
Jul
|
Aug
(29) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
|---|
|
From: Jerry V. <jve...@us...> - 2003-09-11 15:20:45
|
Update of /cvsroot/libimdb/libimdb/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv21809
Modified Files:
imdbParser.c
Log Message:
fixed a couple of typos
Index: imdbParser.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/parser/imdbParser.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** imdbParser.c 28 Aug 2003 15:25:01 -0000 1.4
--- imdbParser.c 11 Sep 2003 15:20:41 -0000 1.5
***************
*** 1006,1010 ****
break;
}
! PARE_LIST_FILE_MISSING_INITIAL_SEPARATORn_FAILURE(logh, pathname, msg, int, -1);
}
}
--- 1006,1010 ----
break;
}
! PARE_LIST_FILE_MISSING_INITIAL_SEPARATOR_FAILURE(logh, pathname, msg, int, -1);
}
}
***************
*** 1263,1267 ****
if ( sepFound != 3 ) {
! PARE_LIST_FILE_MISSING_FINAL_SEPARATO_RFAILURE(logh, pathname, "line starting with '-------'", int, -1);
}
--- 1263,1267 ----
if ( sepFound != 3 ) {
! PARE_LIST_FILE_MISSING_FINAL_SEPARATOR_FAILURE(logh, pathname, "line starting with '-------'", int, -1);
}
|
|
From: Jerry V. <jve...@us...> - 2003-09-11 15:20:07
|
Update of /cvsroot/libimdb/libimdb/demo/dumpMovies In directory sc8-pr-cvs1:/tmp/cvs-serv21578 Modified Files: main.c Log Message: quiet ! Index: main.c =================================================================== RCS file: /cvsroot/libimdb/libimdb/demo/dumpMovies/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 21 Aug 2003 22:42:59 -0000 1.3 --- main.c 11 Sep 2003 15:20:03 -0000 1.4 *************** *** 20,24 **** const struct MovieInList_s *data=entry; /*fprintf(stderr, "%d:type=%d, %s (%04d)\n", data->number, data->type, data->title, data->year);*/ - fprintf(stdout, "%d:type=%d, %s (%04d)\n", data->number, data->type, data->title, data->year); /*return(1);*/ break; --- 20,23 ---- |
|
From: Jerry V. <jve...@us...> - 2003-09-11 15:19:25
|
Update of /cvsroot/libimdb/libimdb In directory sc8-pr-cvs1:/tmp/cvs-serv21374 Modified Files: Makefile TODO constants.mk rules.mk Log Message: new slimmer build env Index: Makefile =================================================================== RCS file: /cvsroot/libimdb/libimdb/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 16 Jun 2003 04:18:37 -0000 1.1 --- Makefile 11 Sep 2003 15:19:11 -0000 1.2 *************** *** 26,34 **** config\ config.mk: Makefile ! @echo "creating config.mk..." ! @(echo "PROJECT_TOP=`pwd`";\ ! echo "JAVA_COMPILER=SUNJava14" ;\ ! echo "JAVA_RUNTIME=SUNJava14" ;\ ! echo "JAVADOC_RUNTIME=SUNJava14" ;\ ! echo "RT_JAR=SUNJava14" ;\ ! ) > config.mk --- 26,29 ---- config\ config.mk: Makefile ! echo "creating config.mk..." ! echo "PROJECT_TOP=`pwd`" > config.mk Index: TODO =================================================================== RCS file: /cvsroot/libimdb/libimdb/TODO,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TODO 28 Aug 2003 15:25:00 -0000 1.5 --- TODO 11 Sep 2003 15:19:11 -0000 1.6 *************** *** 7,12 **** Short list to get things out. - build env clean up ! - not sure what this means right now. - how easy is it to nuke sysincludes.h ? - jlog - put in mpatrol entry points to control on/off jlog --- 7,13 ---- Short list to get things out. + - configure - build env clean up ! - not sure what this means anymore. - how easy is it to nuke sysincludes.h ? - jlog - put in mpatrol entry points to control on/off jlog Index: constants.mk =================================================================== RCS file: /cvsroot/libimdb/libimdb/constants.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** constants.mk 21 Aug 2003 20:34:42 -0000 1.2 --- constants.mk 11 Sep 2003 15:19:11 -0000 1.3 *************** *** 4,16 **** # # Required re-defined variables # PROJECT_TOP - # JAVA_COMPILER (see comments below) - # JAVA_RUNTIME (see comments below) - # JAVADOC_RUNTIME (see comments below) # - COMPILE_BIN=$(PROJECT_TOP)/bin - HOST_DETAILED_ARCH := $(shell uname -m) HOST_DETAILED_OS := $(shell uname -sr | sed 's/ /-/') --- 4,32 ---- # + # The build system is really built AROUND the contents of this file. + # Instead of trying to support every version of every platform.. the + # definitions here are built to identify the os platform, then hard + # code the locations of all useful utilities to get the job done. + # + # Basically, its built to support my systems and my configuration, + # without making it too hard for someone else with a similar system + # to get things to build. + # + # I'm currently it supports CYGWIN 5.0 under Windows 2000 Pro, + # and RedHat 9 (ala Linux 2.4.20-8)... although most of this should + # easily work under other flavours. + # + # Extra non-out-of-the-box bits are minimized, but do include: + # - SWIG Vrsion 1.3.19 (from www.swig.org) - optional + # - mpatrol 1.3.8 (from http://www.cbmamiga.demon.co.uk/mpatrol/index.html) - optional + # - java sdk 1.4.x (from http://java.sun.com) installed in or linked to + # /usr/java/j2sdk1.4. OR set JAVA_HOME in your environment. + # + + # # Required re-defined variables # PROJECT_TOP # HOST_DETAILED_ARCH := $(shell uname -m) HOST_DETAILED_OS := $(shell uname -sr | sed 's/ /-/') *************** *** 42,48 **** HOST_OS_VERSION := $(shell $(__HOST_OS_VERSION__)) - # backward compatibility - OS=$(HOST_OS) - # # BUILD_ARCH / _OS and _PLATFORM --- 58,61 ---- *************** *** 106,113 **** AWK = $(AWK_$(BUILD_OS)) - BISON_CYGWIN := /bin/bison - BISON_LINUX := /usr/bin/bison - BISON = $(BISON_$(BUILD_OS)) - CHMOD_CYGWIN := /bin/chmod CHMOD_LINUX := /bin/chmod --- 119,122 ---- *************** *** 230,238 **** CFLAGS_gcc_TARGET_MINGW :=-mno-cygwin - # this doens't work if you have empty defines :) - #ifeq "$(CFLAGS_$(CC_COMPILER))" "undef" - # $(error CFLAGS_$(CC_COMPILER)) was left undefined, fix constants.mk) - #endif - CFLAGS_DYNAMIC := $(CFLAGS_FPIC) CFLAGS_STATIC := --- 239,242 ---- *************** *** 490,495 **** TEST = $(TEST_$(BUILD_OS)) ! DOXYGEN_CYGWIN := ! DOXYGEN_LINUX :=/usr/bin/doxygen DOXYGEN = $(DOXYGEN_$(BUILD_OS)) --- 494,499 ---- TEST = $(TEST_$(BUILD_OS)) ! DOXYGEN_CYGWIN := ! DOXYGEN_LINUX :=/usr/bin/doxygen DOXYGEN = $(DOXYGEN_$(BUILD_OS)) *************** *** 498,561 **** # - # for convience we define the install path for sun javac - SUNJava14_HOME_CYGWIN :=c:/j2sdk1.4 - SUNJava14_HOME_LINUX :=/usr/java/j2sdk1.4 - SUNJava14_HOME :=$(SUNJava14_HOME_$(BUILD_OS)) - - # JAVAC - # - requires JAVA_COMPILER be one of: - # SUNJava14 - # - ifeq "$(JAVA_COMPILER)" "SUNJava14" - JAVAC_CYGWIN :=$(SUNJava14_HOME)/bin/javac - JAVAC_LINUX :=$(SUNJava14_HOME)/bin/javac - JAVAC =$(JAVAC_$(BUILD_OS)) - endif - - ifeq "$(JAVAC)" "" - $(error JAVAC was left undefined, failed to find JAVA_COMPILER '$(JAVA_COMPILER)') - endif - - # JAVA - # - requires JAVA_RUNTIME be one of: - # SUNJava14 - # - ifeq "$(JAVA_RUNTIME)" "SUNJava14" - JAVA_CYGWIN :=$(SUNJava14_HOME)/bin/java - JAVA_LINUX :=$(SUNJava14_HOME)/bin/java - JAVA =$(JAVA_$(BUILD_OS)) - endif - - ifeq "$(JAVA)" "" - $(error JAVA was left undefined, failed to find JAVA_RUNTIME '$(JAVA_RUNTIME)') - endif - - # JAVADOC - # - requires JAVADOC_RUNTIME be one of: - # SUNJava14 # ! ifeq "$(JAVADOC_RUNTIME)" "SUNJava14" ! JAVADOC_CYGWIN :=$(SUNJava14_HOME)/bin/javadoc ! JAVADOC_LINUX :=$(SUNJava14_HOME)/bin/javadoc ! JAVADOC =$(JAVADOC_$(BUILD_OS)) ! endif ! ! ifeq "$(JAVADOC)" "" ! $(error JAVADOC was left undefined, failed to find JAVADOC_RUNTIME '$(JAVADOC_RUNTIME)') ! endif ! ! # JAR ! # - requires JAR_RUNTIME be one of: ! # SUNJava14 # ! ifeq "$(JAR_RUNTIME)" "SUNJava14" ! JAR_CYGWIN :=$(SUNJava14_HOME)/bin/jar ! JAR_LINUX :=$(SUNJava14_HOME)/bin/jar ! JAR =$(JAR_$(BUILD_OS)) ! endif ! ifeq "$(JAR)" "" ! $(error JAR was left undefined, failed to find JAR_RUNTIME '$(JAR_RUNTIME)') ! endif # RT_JAR --- 502,517 ---- # # ! # for convience we define the install path for sun javac # ! JAVA_HOME_CYGWIN :=c:/j2sdk1.4 ! JAVA_HOME_LINUX :=/usr/java/j2sdk1.4 ! JAVA_HOME =$(JAVA_HOME_$(BUILD_OS)) ! # JAVAC, JAVA, JAVADOC and JAR cmd paths ! JAVAC =$(JAVA_HOME)/bin/javac ! JAVA =$(JAVA_HOME)/bin/java ! JAVADOC =$(JAVA_HOME)/bin/javadoc ! JAR =$(JAVA_HOME)/bin/jar # RT_JAR *************** *** 564,584 **** # # JNI_INCLUDE ! # - used for swig projects building jni interfaces ! # ! ifeq "$(RT_JAR)" "SUNJava14" ! RT_JAR_HOME_CYGWIN :=$(SUNJava14_HOME) ! RT_JAR_HOME_LINUX :=$(SUNJava14_HOME) ! RT_JAR_HOME =$(RT_JAR_HOME_$(BUILD_OS)) ! ! JNI_INCLUDE_DIR :=$(SUNJava14_HOME)/include ! endif ! ! ifeq "$(RT_JAR_HOME)" "" ! $(error RT_JAR_HOME was left undefined, failed to find RT_JAR '$(RT_JAR)') ! endif ! ! ifeq "$(JNI_INCLUDE_DIR)" "" ! $(error JNI_INCLUDE_DIR was left undefined, check RT_JAR '$(RT_JAR)' defines) ! endif JNI_CPPFLAGS_CYGWIN :=-I$(JNI_INCLUDE_DIR)/win32 --- 520,524 ---- # # JNI_INCLUDE ! JNI_INCLUDE_DIR :=$(JAVA_HOME)/include JNI_CPPFLAGS_CYGWIN :=-I$(JNI_INCLUDE_DIR)/win32 *************** *** 589,595 **** # # swap -O for -g for optimized JAVAC_FLAGS_SUNJava14 :=-deprecation -encoding iso-8859-1 -source 1.4 -target 1.4 -g:none -g ! JAVAC_FLAGS =$(JAVAC_FLAGS_$(JAVA_COMPILER)) JAVAC_CLASSPATH:= --- 529,537 ---- # # swap -O for -g for optimized + # for future reference, we split these based on what compiler we think + # we're using. JAVAC_FLAGS_SUNJava14 :=-deprecation -encoding iso-8859-1 -source 1.4 -target 1.4 -g:none -g ! JAVAC_FLAGS =$(JAVAC_FLAGS_SUNJava14) JAVAC_CLASSPATH:= *************** *** 600,612 **** JAVA_FLAGS =-DPROJECT_TOP=$(PROJECT_TOP) - # Now add the remaining stuff - JAVA_CLASSPATH +=$(JAR_CLASSPATH) - # path to java sources ! JAVA_SRCS_SOURCEPATH_CYGWIN :=$(RT_JAR_HOME)/src ! JAVA_SRCS_SOURCEPATH_LINUX :=$(RT_JAR_HOME)/src ! JAVA_SRCS_SOURCEPATH :=$(JAVA_SRCS_SOURCEPATH_$(BUILD_OS)) ! JAVADOC_FLAGS_14 := -link http://java.sun.com/j2se/1.4.1/docs/api JAVADOC_FLAGS = -use -private -splitIndex -version \ --- 542,549 ---- JAVA_FLAGS =-DPROJECT_TOP=$(PROJECT_TOP) # path to java sources ! JAVA_SRCS_SOURCEPATH :=$(JAVA_HOME)/src ! JAVADOC_FLAGS_SUNJava14 := -link http://java.sun.com/j2se/1.4.1/docs/api JAVADOC_FLAGS = -use -private -splitIndex -version \ *************** *** 615,619 **** -header 'Project libimdb API' \ -bottom 'Project libimdb API' \ ! $(JAVADOC_FLAGS_$(JAVA_COMPILER)) JAVADOC_SOURCEPATH =. --- 552,556 ---- -header 'Project libimdb API' \ -bottom 'Project libimdb API' \ ! $(JAVADOC_FLAGS_SUNJava14) JAVADOC_SOURCEPATH =. *************** *** 678,690 **** SRCS.JAVA=$(wildcard *.java) - SRCS.PERLSWIG=$(wildcard *.perlswig) - SRCS.JAVASWIG=$(wildcard *.javaswig) - SRCS.JAVASWIGXX=$(wildcard *.javaswigxx) - GENERATED_SRCS =$(patsubst %.l, gen_$(BUILD_OS)/%.c, $(SRCS.L)) \ ! $(patsubst %.y, gen_$(BUILD_OS)/%.c, $(SRCS.Y)) \ ! $(patsubst %.perlswig, gen_$(BUILD_OS)/%_swig.c, $(SRCS.PERLSWIG)) \ ! $(patsubst %.javaswig, gen_$(BUILD_OS)/%_swig.c, $(SRCS.JAVASWIG)) \ ! $(patsubst %.javaswigxx, gen_$(BUILD_OS)/%_swig.cpp, $(SRCS.JAVASWIGXX)) GENERATED_HDRS =$(patsubst %.y, gen_$(BUILD_OS)/%.h, $(SRCS.Y)) --- 615,620 ---- SRCS.JAVA=$(wildcard *.java) GENERATED_SRCS =$(patsubst %.l, gen_$(BUILD_OS)/%.c, $(SRCS.L)) \ ! $(patsubst %.y, gen_$(BUILD_OS)/%.c, $(SRCS.Y)) GENERATED_HDRS =$(patsubst %.y, gen_$(BUILD_OS)/%.h, $(SRCS.Y)) *************** *** 696,705 **** # (specifically, no generated files in the source directory), then # we can remove the tr and sort -u. ! #DEFAULT_SRCS = $(shell echo $(wildcard *.c *.cc) $(GENERATED_SRCS) | tr -s ' ' '\012' | $(SORT) -u) ! DEFAULT_SRCS =$(wildcard *.c *.cc *.cpp) $(GENERATED_SRCS) # # get list of srcs we want ! SRCS =$(DEFAULT_SRCS) # we need the notdir to remove the gen_$(BUILD_OS) portion from the --- 626,634 ---- # (specifically, no generated files in the source directory), then # we can remove the tr and sort -u. ! SRCS_TO_COMPILE =$(SRCS.C) $(SRCS.CC) $(GENERATED_SRCS) # # get list of srcs we want ! SRCS=$(SRCS_TO_COMPILE) # we need the notdir to remove the gen_$(BUILD_OS) portion from the Index: rules.mk =================================================================== RCS file: /cvsroot/libimdb/libimdb/rules.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rules.mk 16 Jun 2003 04:18:37 -0000 1.1 --- rules.mk 11 Sep 2003 15:19:11 -0000 1.2 *************** *** 18,32 **** endif $(RM) -rf $(BUILD_CFG) gen_$(BUILD_OS) ! oldclobber: ! ! depend:: ! $(RM) -f $(DEPEND_FILE) $(DEPEND_FILE)-* install: build - playpen:: - @true - ifeq "$(BUILDING_DYNAMIC)-$(OBJS_TYPE)" "false-DYNAMIC" objs:; @$(ECHO) NOT building dynamic objs --- 18,27 ---- endif $(RM) -rf $(BUILD_CFG) gen_$(BUILD_OS) + $(RM) -f $(DEPEND_FILE) ! depend:: $(DEPEND_FILE) install: build ifeq "$(BUILDING_DYNAMIC)-$(OBJS_TYPE)" "false-DYNAMIC" objs:; @$(ECHO) NOT building dynamic objs *************** *** 38,45 **** @[ -d $(@D) ] || $(MKPATH) $(@D) @$(ECHO) "generating $@.." ! ifeq ($(strip $(DEFAULT_SRCS)),) $(TOUCH) $@ else ! @for f in X $(DEFAULT_SRCS); do \ [ "$$f" = X ] && continue; \ case $$f in \ --- 33,40 ---- @[ -d $(@D) ] || $(MKPATH) $(@D) @$(ECHO) "generating $@.." ! ifeq ($(strip $(SRCS_TO_COMPILE)),) $(TOUCH) $@ else ! @for f in X $(SRCS_TO_COMPILE); do \ [ "$$f" = X ] && continue; \ case $$f in \ *************** *** 51,55 **** done | $(SED) -e 's/\.o:/\.$(O):/' -e '/^[^ ]/s,^,$$(OBJS_DIR)/,' > $@ endif - @[ "$(SRCS.SWIG)" = "" ] || $(PERL) $(COMPILE_BIN)/swigdepend.pl $(CPPFLAGS) $(SRCS.SWIG) >> $@ ifdef PROGRAM --- 46,49 ---- *************** *** 108,168 **** endif - # - # generate wrapper for JAVA runtime for non-make usage - # - $(PROJECT_TOP)/gen/runjava: $(PROJECT_TOP)/constants.mk $(PROJECT_TOP)/config.mk $(PROJECT_TOP)/rules.mk - @$(ECHO) "generating $@.." - @[ -d $(@D) ] || $(MKPATH) $(@D) - @$(ECHO) '$(JAVA) $(JAVA_FLAGS) -classpath "$(subst $(space),$(CLASSPATH_SEP),$(strip $(JAVASRCS_CLASSES_DEST) $(JAVA_CLASSPATH)) $(ALL_3RD_PARTY_JARS) $$CLASSPATH)" "$$@"' > $@ - @$(CHMOD) +x $@ - - # - # generate something useful for java classes like EtherProgram to parse - # and understand how to invoke a controlable (ha) jvm child process - # - # - $(PROJECT_TOP)/gen/jvm.config: $(PROJECT_TOP)/constants.mk $(PROJECT_TOP)/config.mk $(PROJECT_TOP)/rules.mk - @$(ECHO) "generating $@.." - @[ -d $(@D) ] || $(MKPATH) $(@D) - @($(ECHO) "# This file is provided for java classes who";\ - $(ECHO) "# want to invoke a controlable (ha) jvm child process";\ - $(ECHO) "# access to the JAVAC command line that otherwise only" ;\ - $(ECHO) "# Warning:format is compatible with CmdLine class, not shell usage";\ - $(ECHO) "JDB_PATHNAME $(JDB)";\ - $(ECHO) "JDB_STANDARD_FLAGS $(JDB_FLAGS)";\ - $(ECHO) "JVM_PATHNAME $(JAVA)";\ - $(ECHO) "JVM_STANDARD_FLAGS $(JAVA_FLAGS)";\ - $(ECHO) "JVM_STANDARD_CLASSPATH $(subst $(space),$(CLASSPATH_SEP),$(strip $(JAVASRCS_CLASSES_DEST) $(JAVA_CLASSPATH)) $$CLASSPATH)" )> $@ - @$(CHMOD) +r $@ - - # - # generate wrapper for JAVAC runtime for non-make usage - # see comments for more details - # - $(PROJECT_TOP)/gen/runjavac: $(PROJECT_TOP)/constants.mk $(PROJECT_TOP)/config.mk $(PROJECT_TOP)/rules.mk - @$(ECHO) "generating $@.." - @[ -d $(@D) ] || $(MKPATH) $(@D) - @($(ECHO) "# This script is generated during a 'make' to provide" ;\ - $(ECHO) "# access to the JAVAC command line that otherwise only" ;\ - $(ECHO) "# make' would have acess to." ;\ - $(ECHO) "# " ;\ - $(ECHO) "# Typical usage include providing a '-d <dir>' and a" ;\ - $(ECHO) "# list of classes to compile, but not required." ;\ - $(ECHO) '$(JAVAC) $(JAVAC_FLAGS) -sourcepath . -classpath "$(subst $(space),$(CLASSPATH_SEP),$(strip $(JAVASRCS_CLASSES_DEST) $(JAVAC_CLASSPATH)) $$CLASSPATH)" "$$@"' ) > $@ - @$(CHMOD) +x $@ - - # - # generate wrapper for PERL runtime for non-make usage - # - $(PROJECT_TOP)/gen/runperl: $(PROJECT_TOP)/constants.mk $(PROJECT_TOP)/config.mk $(PROJECT_TOP)/rules.mk - @$(ECHO) "generating $@.." - @[ -d $(@D) ] || $(MKPATH) $(@D) - @($(ECHO) "# This script is generated during a 'make' to provide" ;\ - $(ECHO) "# an easy way to invoke the perl run-time as defined in constants.mk" ;\ - $(ECHO) "# without all having to use make to get things done." ;\ - $(ECHO) "# " ;\ - $(ECHO) '$(PERL) -I$(PROJECT_TOP)/lib/perl "$$@"') > $@ - @$(CHMOD) +x $@ - $(OBJS_DIR)/%.$(O): gen_$(BUILD_OS)/%.c @[ -d $(@D) ] || $(MKPATH) $(@D) --- 102,105 ---- *************** *** 180,195 **** @[ -d $(@D) ] || $(MKPATH) $(@D) $(CXX) -c $(CCFLAGS) $(CPPFLAGS) -o $@ $< - - # - # Generated sources: - # - gen_$(BUILD_OS)/%.c \ - gen_$(BUILD_OS)/%.h: %.y - @[ -d $(@D) ] || $(MKDIR) $(@D) - $(BISON) -d -o gen_$(BUILD_OS)/$*.c $< - - gen_$(BUILD_OS)/%.c: %.l - @[ -d $(@D) ] || $(MKDIR) $(@D) - $(LEX) $(LEXFLAGS) $< > $@ ifdef INCLUDE_DEPENDENCIES --- 117,120 ---- |
|
From: Jerry V. <jve...@us...> - 2003-09-04 22:40:19
|
Update of /cvsroot/libimdb/libimdb/include/jlog In directory sc8-pr-cvs1:/tmp/cvs-serv20259 Added Files: .cvsignore Log Message: ignore generated header files --- NEW FILE: .cvsignore --- dicerr.h parerr.h |
|
From: Jerry V. <jve...@us...> - 2003-08-28 15:25:56
|
Update of /cvsroot/libimdb/web In directory sc8-pr-cvs1:/tmp/cvs-serv20701 Modified Files: doxygen.cfg Log Message: now works...a bit Index: doxygen.cfg =================================================================== RCS file: /cvsroot/libimdb/web/doxygen.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** doxygen.cfg 27 Aug 2003 21:57:12 -0000 1.1 --- doxygen.cfg 28 Aug 2003 15:25:53 -0000 1.2 *************** *** 4,10 **** # General configuration options #--------------------------------------------------------------------------- ! PROJECT_NAME = PROJECT_NUMBER = ! OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO --- 4,10 ---- # General configuration options #--------------------------------------------------------------------------- ! PROJECT_NAME = "LibIMDB API" PROJECT_NUMBER = ! OUTPUT_DIRECTORY = doxygen OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO *************** *** 50,54 **** # configuration options related to warning and progress messages #--------------------------------------------------------------------------- ! QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES --- 50,54 ---- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- ! QUIET = YES WARNINGS = YES WARN_IF_UNDOCUMENTED = YES *************** *** 59,65 **** # configuration options related to the input files #--------------------------------------------------------------------------- ! INPUT = ! FILE_PATTERNS = ! RECURSIVE = NO EXCLUDE = EXCLUDE_SYMLINKS = NO --- 59,65 ---- # configuration options related to the input files #--------------------------------------------------------------------------- ! INPUT = ../libimdb/include ../libimdb/libjlog ../libimdb/parser ! FILE_PATTERNS = *.c *.h ! RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO *************** *** 74,80 **** # configuration options related to source browsing #--------------------------------------------------------------------------- ! SOURCE_BROWSER = NO INLINE_SOURCES = NO ! STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES --- 74,80 ---- # configuration options related to source browsing #--------------------------------------------------------------------------- ! SOURCE_BROWSER = YES INLINE_SOURCES = NO ! STRIP_CODE_COMMENTS = NO REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES *************** *** 108,112 **** # configuration options related to the LaTeX output #--------------------------------------------------------------------------- ! GENERATE_LATEX = YES LATEX_OUTPUT = latex LATEX_CMD_NAME = latex --- 108,112 ---- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- ! GENERATE_LATEX = NO LATEX_OUTPUT = latex LATEX_CMD_NAME = latex *************** *** 169,173 **** #--------------------------------------------------------------------------- TAGFILES = ! GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES --- 169,173 ---- #--------------------------------------------------------------------------- TAGFILES = ! GENERATE_TAGFILE = doxygen/tagfile ALLEXTERNALS = NO EXTERNAL_GROUPS = YES *************** *** 178,182 **** CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES ! HAVE_DOT = NO CLASS_GRAPH = YES COLLABORATION_GRAPH = YES --- 178,182 ---- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES ! HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = YES |
|
From: Jerry V. <jve...@us...> - 2003-08-28 15:25:37
|
Update of /cvsroot/libimdb/web
In directory sc8-pr-cvs1:/tmp/cvs-serv20652
Modified Files:
Makefile
Log Message:
added doc target
Index: Makefile
===================================================================
RCS file: /cvsroot/libimdb/web/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 16 Aug 2003 21:14:10 -0000 1.2
--- Makefile 28 Aug 2003 15:25:34 -0000 1.3
***************
*** 13,19 ****
./generate.pl /home/groups/l/li/libimdb/htdocs/test_install
-
install:
rm -rf /home/groups/l/li/libimdb/htdocs
mkdir /home/groups/l/li/libimdb/htdocs
./generate.pl /home/groups/l/li/libimdb/htdocs
--- 13,24 ----
./generate.pl /home/groups/l/li/libimdb/htdocs/test_install
install:
rm -rf /home/groups/l/li/libimdb/htdocs
mkdir /home/groups/l/li/libimdb/htdocs
./generate.pl /home/groups/l/li/libimdb/htdocs
+
+ doc:
+ rm -rf doxygen
+ mkdir doxygen
+ doxygen doxygen.cfg 2>&1 | perl -pe 'open(FD, "> doxygen/undocumented") ; while (<>) { if ( m/is not documented/o ) {print FD;} else {print;}}; close(FD);' > doxygen/errors
+
|
|
From: Jerry V. <jve...@us...> - 2003-08-28 15:25:05
|
Update of /cvsroot/libimdb/libimdb/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv20497/parser
Modified Files:
imdbDict.c imdbParser.c private.h
Log Message:
a flurry of documentation done
Index: imdbDict.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/parser/imdbDict.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imdbDict.c 16 Jun 2003 04:18:38 -0000 1.1
--- imdbDict.c 28 Aug 2003 15:25:00 -0000 1.2
***************
*** 25,35 ****
/*#include "private.h"*/
! struct imdbDict_s
! {
! int fd;
! char dir[1024];
! imdbParser_t *parser;
};
static inline void
writeIt(int fd, char *in)
--- 25,41 ----
/*#include "private.h"*/
! /**
! * management structure for internal state information
! * for imdbDict_t to work
! */
! struct imdbDict_s {
! int fd; /**< file descriptor we're writting to */
! char dir[1024]; /**< directory path of output files */
! imdbParser_t *parser; /**< imdbParser to parse list files */
};
+ /**
+ * @todo - not used
+ */
static inline void
writeIt(int fd, char *in)
***************
*** 93,96 ****
--- 99,107 ----
}
+ /**
+ * our list entry callback function
+ * @returns 0 if everything is okay and we should continue
+ * @returns non-zero if parse should abort.
+ */
static int
listentry_cb(jlogHandle_t *logh,
***************
*** 149,152 ****
--- 160,166 ----
}
+ /**
+ * allocate new imdbDict for use
+ */
imdbDict_t *
imdbDict_create(jlogHandle_t *logh,
***************
*** 173,176 ****
--- 187,193 ----
}
+ /**
+ * deallocate new imdbDict for use
+ */
int
imdbDict_destroy(jlogHandle_t *logh,
***************
*** 182,185 ****
--- 199,208 ----
}
+ /**
+ * index movies info a 'moviedb.idx' file.
+ *
+ * @returns 0 upon success
+ * @returns -1 if process was aborted for some reason
+ */
int
imdbDict_indexMovies(jlogHandle_t *logh,
Index: imdbParser.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/parser/imdbParser.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** imdbParser.c 21 Aug 2003 22:44:31 -0000 1.3
--- imdbParser.c 28 Aug 2003 15:25:01 -0000 1.4
***************
*** 82,85 ****
--- 82,88 ----
#endif
+ /**
+ * set progresss callbacks for start/progress/finished points in the parse.
+ */
int
imdbParser_setProgressCallbacks(jlogHandle_t *logh,
***************
*** 102,105 ****
--- 105,111 ----
}
+ /**
+ * disable all progress callbacks
+ */
int
imdbParser_disableProgressCallbacks(jlogHandle_t *logh,
***************
*** 109,112 ****
--- 115,126 ----
}
+ /**
+ * allocate new imdbParser with progress callbacks disabled.
+ *
+ * @returns NULL on:
+ * - PARE_INVALID_ARGUMENT
+ * - PARE_DIRECTORY_READ_FAILURE
+ * - PARE_BAD_MEM
+ */
imdbParser_t *
imdbParser_open(jlogHandle_t *logh,
***************
*** 148,151 ****
--- 162,169 ----
}
+ /**
+ * set user handle so list entry callbacks and progress callbacks
+ * have some sense of where they are.
+ */
void *
imdbParser_setUserHandle(jlogHandle_t *logh,
***************
*** 158,161 ****
--- 176,182 ----
}
+ /**
+ * get the last user handle set via 'imdbParser_setUserHandle'
+ */
void *
imdbParser_getUserHandle(jlogHandle_t *logh,
***************
*** 165,168 ****
--- 186,194 ----
}
+ /**
+ * unallocate a imdbParser handle.
+ *
+ * @returns -1 on PARE_INVALID_ARGUMENT (parser handle is invalid)
+ */
int
imdbParser_close(jlogHandle_t *logh,
***************
*** 181,191 ****
}
struct line_s {
! char *buf;
! int used;
! int size;
! int number;
};
static int
readLine(jlogHandle_t *logh, FILE *fp, struct line_s *line)
--- 207,229 ----
}
+ /**
+ * private management structure for tracking parsed lines
+ * along with memory management.
+ */
struct line_s {
! char *buf; /**< pointer to allocated buffer containing a single line of input */
! int used; /**< number of characters in buf used */
! int size; /**< size of allocated buffer 'buf' points in bytes */
! int number; /**< what line number is this */
};
+ /** @def INC
+ * how much should we expand the buffer by if we need more ?
+ */
+ #define INC 256
+
+ /**
+ * read a single line from the specified input file pointer.
+ */
static int
readLine(jlogHandle_t *logh, FILE *fp, struct line_s *line)
***************
*** 211,216 ****
while ( line->buf[line->used-1] != '\n' ) {
- #define INC 256
-
line->buf=realloc(line->buf, line->size+INC);
if ( line->buf == NULL ) {
--- 249,252 ----
***************
*** 433,436 ****
--- 469,477 ----
}
+ /**
+ * decode a movie label into its parts.
+ * @returns 0 upon success
+ * @returns -1 on PARE_FORMAT_ERROR
+ */
int
imdbParser_decodeMovieLabel(jlogHandle_t *logh,
***************
*** 578,581 ****
--- 619,636 ----
}
+ /**
+ * initiate parsing the movies list file.
+ *
+ * @returns -1 on:
+ * - PARE_INVALID_ARGUMENT
+ * - PARE_READ_FAILED
+ * - PARE_BAD_MEM
+ * - PARE_LIST_FILE_MISSING_INITIAL_SEPARATOR
+ * - PARE_LIST_FILE_MISSING_FINAL_SEPARATOR
+ * @returns 0 upon success
+ *
+ * @returns non-zero if listEntry_cb returns non-zero to signal
+ * abort (better not be -1)
+ */
int
imdbParser_moviesParse(jlogHandle_t *logh,
***************
*** 790,793 ****
--- 845,862 ----
}
+ /**
+ * file parser for directors, actors and actresses list files
+ *
+ * @returns -1 on:
+ * - PARE_INVALID_ARGUMENT
+ * - PARE_READ_FAILED
+ * - PARE_BAD_MEM
+ * - PARE_LIST_FILE_MISSING_INITIAL_SEPARATOR
+ * - PARE_LIST_FILE_MISSING_FINAL_SEPARATOR
+ * @returns 0 upon success
+ *
+ * @returns non-zero if listEntry_cb returns non-zero to signal
+ * abort (better not be -1)
+ */
static int
imdbParser_castOrDirectorsParse(jlogHandle_t *logh,
***************
*** 937,941 ****
break;
}
! PARE_LIST_FILE_MISSING_INITIAL_SEPARATOR_FAILURE(logh, pathname, msg, int, -1);
}
}
--- 1006,1010 ----
break;
}
! PARE_LIST_FILE_MISSING_INITIAL_SEPARATORn_FAILURE(logh, pathname, msg, int, -1);
}
}
***************
*** 1028,1032 ****
*gt='\0';
while (isspace(*aka)) {
! *aka++;
}
*gt=')';
--- 1097,1101 ----
*gt='\0';
while (isspace(*aka)) {
! aka++;
}
*gt=')';
***************
*** 1194,1198 ****
if ( sepFound != 3 ) {
! PARE_LIST_FILE_MISSING_FINAL_SEPARATOR_FAILURE(logh, pathname, "line starting with '-------'", int, -1);
}
--- 1263,1267 ----
if ( sepFound != 3 ) {
! PARE_LIST_FILE_MISSING_FINAL_SEPARATO_RFAILURE(logh, pathname, "line starting with '-------'", int, -1);
}
***************
*** 1200,1203 ****
--- 1269,1275 ----
}
+ /**
+ * initiate parsing the directors list file.
+ */
int
imdbParser_directorsParse(jlogHandle_t *logh,
***************
*** 1209,1212 ****
--- 1281,1287 ----
}
+ /**
+ * initiate parsing the actors list file.
+ */
int
imdbParser_actorsParse(jlogHandle_t *logh,
***************
*** 1218,1221 ****
--- 1293,1299 ----
}
+ /**
+ * initiate parsing the actresses list file.
+ */
int
imdbParser_actressesParse(jlogHandle_t *logh,
Index: private.h
===================================================================
RCS file: /cvsroot/libimdb/libimdb/parser/private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** private.h 16 Jun 2003 04:18:38 -0000 1.1
--- private.h 28 Aug 2003 15:25:01 -0000 1.2
***************
*** 4,22 ****
*/
! /*typedef void (FormatError_cb_t)(jlogHandle_t *logh,
! imdbParser_t *parser,
! const char *pathname,
! int lineNumber,
! const char *message);*/
!
! typedef struct movieStats_s {
! int numTVMiniSeries;
! int numMovie;
! int numTVSeries;
! int numTVMovie;
! int numVideoMovie;
! int numVideoGame;
! } movieStats_t;
!
struct imdbParser_s
{
--- 4,10 ----
*/
! /**
! * management structure for imdbParser
! */
struct imdbParser_s
{
***************
*** 24,51 ****
char *dbsDir;
! /*FormatError_cb_t *formatError_cb;*/
!
progressStarting_cb_t *progressStarting_cb;
progressUpdate_cb_t *progressUpdate_cb;
progressFinished_cb_t *progressFinished_cb;
ListEntry_cb_t *listEntry_cb;
struct {
! movieStats_t movieList;
struct {
! int numDirectors;
! movieStats_t movies;
} directorsList;
struct {
! int numActors;
! movieStats_t movies;
} actorsList;
struct {
! int numActresses;
! movieStats_t movies;
} actressesList;
--- 12,48 ----
char *dbsDir;
! /** progress callback - processing started callback */
progressStarting_cb_t *progressStarting_cb;
+
+ /** progress callback - processing progress callback */
progressUpdate_cb_t *progressUpdate_cb;
+
+ /** progress callback - processing finished callback */
progressFinished_cb_t *progressFinished_cb;
+ /** callback for each list entry */
ListEntry_cb_t *listEntry_cb;
+ /** running statistics collected during parse */
struct {
! struct {
! int numTVMiniSeries; /**< self described */
! int numMovie; /**< self described */
! int numTVSeries; /**< self described */
! int numTVMovie; /**< self described */
! int numVideoMovie; /**< self described */
! int numVideoGame; /**< self described */
! } movieList;
struct {
! int numDirectors; /**< self described */
} directorsList;
struct {
! int numActors; /**< self described */
} actorsList;
struct {
! int numActresses; /**< self described */
} actressesList;
|
|
From: Jerry V. <jve...@us...> - 2003-08-28 15:25:05
|
Update of /cvsroot/libimdb/libimdb/libjlog
In directory sc8-pr-cvs1:/tmp/cvs-serv20497/libjlog
Modified Files:
jlog.c jlog2File.c jlogTracker.c
Log Message:
a flurry of documentation done
Index: jlog.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/libjlog/jlog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jlog.c 21 Aug 2003 22:45:18 -0000 1.2
--- jlog.c 28 Aug 2003 15:25:00 -0000 1.3
***************
*** 24,29 ****
#include "jlog/jlogTracker.h"
! typedef struct mymod_s { jlogModule_e mod; char *str; } mymod_t;
jlogCallbackHandle_t *
jlogCallback_create(jlog_eventCallback_t *cb,
--- 24,41 ----
#include "jlog/jlogTracker.h"
! /**
! * private management struct of mod to string translation
! */
! typedef struct mymod_s {
! jlogModule_e mod; /**< module */
! char *str; /**< equivalent string representation */
! } mymod_t;
+ /**
+ * allocate and initialize a new jlogCallbackHandle_t
+ *
+ * @returns NULL on malloc failure
+ * @returns jlogCallbackHandle_t handle upon success
+ */
jlogCallbackHandle_t *
jlogCallback_create(jlog_eventCallback_t *cb,
***************
*** 46,50 ****
}
!
void
jlogCallback_destroy(jlogCallbackHandle_t *l)
--- 58,64 ----
}
! /**
! * deallocate a jlogCallbackHandle_t
! */
void
jlogCallback_destroy(jlogCallbackHandle_t *l)
***************
*** 53,56 ****
--- 67,76 ----
}
+ /**
+ * set the notification levels you want
+ *
+ * @returns 0 upon success
+ * @returns -1 if specified module does not exist
+ */
int
jlogCallback_setNotificationLevel(jlogCallbackHandle_t *cbHandle,
***************
*** 77,81 ****
* register an event callback.
*
! * returns -1 on malloc failure
*/
int
--- 97,102 ----
* register an event callback.
*
! * @returns 0 upon success
! * @returns -1 on malloc failure
*/
int
***************
*** 117,120 ****
--- 138,147 ----
}
+ /**
+ * unregister an event callback
+ *
+ * @returns 0 upon success
+ * @returns -1 if specified cb wasn't registered
+ */
int
jlog_unregisterEventCallback(jlogHandle_t *logh,
***************
*** 145,149 ****
static long closes_ever_g=0; /* number of times log_close succeeded */
! /** create a new log handle, or note the re-use of an existing
* log handle. If reuseh is not NULL, reference count of logh is
* incremented and returned.
--- 172,177 ----
static long closes_ever_g=0; /* number of times log_close succeeded */
! /**
! * create a new log handle, or note the re-use of an existing
* log handle. If reuseh is not NULL, reference count of logh is
* incremented and returned.
***************
*** 395,401 ****
}
! /** destroy an log handle, decrements the reference count by one, and
* frees the resources associated with logh if the reference count reaches
* zero.
* returns -1 if logh is invalid
*/
--- 423,431 ----
}
! /**
! * Destroy an log handle, decrements the reference count by one, and
* frees the resources associated with logh if the reference count reaches
* zero.
+ *
* returns -1 if logh is invalid
*/
***************
*** 470,474 ****
}
! /** get the last module error number
* returns MOD_ALL if logh is invalid.
* returns MOD_NONE if no error has been reported since log_open or log_reset
--- 500,505 ----
}
! /**
! * get the last module error number
* returns MOD_ALL if logh is invalid.
* returns MOD_NONE if no error has been reported since log_open or log_reset
***************
*** 487,493 ****
}
! /** get the last reported messageNumber
* @returns -1 if logh is invalid, or last occuring messageNumber
!
* Value of messageNumber is dependent on a module that set it. For instance
* for a particular module, messageNumber may be an index into a more useful
--- 518,525 ----
}
! /**
! * get the last reported messageNumber
* @returns -1 if logh is invalid, or last occuring messageNumber
! *
* Value of messageNumber is dependent on a module that set it. For instance
* for a particular module, messageNumber may be an index into a more useful
***************
*** 507,510 ****
--- 539,546 ----
}
+ /**
+ * reset all what jlog_messageModule and jlog_messageNumber
+ * values would be to MOD_NONE and 0 respectively.
+ */
int
jlog_reset(jlogHandle_t *logh)
***************
*** 541,544 ****
--- 577,583 ----
}*/
+ /**
+ * real worker
+ */
static int
localfmt(jlogHandle_t *logh,
***************
*** 765,768 ****
--- 804,810 ----
}
+ /**
+ * function enter callback
+ */
int
jlog_enter(jlogHandle_t *logh,
***************
*** 785,788 ****
--- 827,833 ----
}
+ /**
+ * function success callback
+ */
int
jlog_success(jlogHandle_t *logh,
***************
*** 805,808 ****
--- 850,856 ----
}
+ /**
+ * function failure callback
+ */
int
jlog_failure(jlogHandle_t *logh,
Index: jlog2File.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/libjlog/jlog2File.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jlog2File.c 21 Aug 2003 22:45:18 -0000 1.2
--- jlog2File.c 28 Aug 2003 15:25:00 -0000 1.3
***************
*** 100,103 ****
--- 100,110 ----
}
+ /**
+ * allocate a new jlog2File_t handle which when used with jlog_registerEventCallback,
+ * allows for easy redirection of jlog events to a file.
+ *
+ * @returns jlog2File_t handle upon success
+ * @returns NULL on malloc failure
+ */
jlog2File_t *
jlog2File_create(char *filename)
***************
*** 130,133 ****
--- 137,145 ----
}
+ /**
+ * disable and unallocate a jlog2File handle
+ *
+ * @returns 0 always
+ */
int
jlog2File_destroy(jlog2File_t *lt)
***************
*** 139,142 ****
--- 151,161 ----
}
+ /**
+ * enable the jlog2File, this causes redirection to the
+ * specified file (or stdout) to start.
+ *
+ * @returns 0 upon success
+ * @returns -1 if opening file with flags O_CREAT|O_RDWR|O_APPEND and mode 0660 failed.
+ */
int
jlog2File_enable(jlog2File_t *lt)
***************
*** 157,160 ****
--- 176,185 ----
}
+ /**
+ * disable redirection to file
+ *
+ * @returns 0 upon success
+ * @returns -1 if close on open file failed
+ */
int
jlog2File_disable(jlog2File_t *lt)
***************
*** 174,177 ****
--- 199,205 ----
}
+ /**
+ * get filename
+ */
char *
jlog2File_getFilename(jlog2File_t *lt)
***************
*** 180,183 ****
--- 208,215 ----
}
+ /**
+ * get jlogCallbackHandle_t for use with
+ * jlog_registerEventCallback().
+ */
jlogCallbackHandle_t *
jlog2File_getJLogCallbackHandle(jlog2File_t *lt)
Index: jlogTracker.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/libjlog/jlogTracker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jlogTracker.c 16 Jun 2003 04:18:38 -0000 1.1
--- jlogTracker.c 28 Aug 2003 15:25:00 -0000 1.2
***************
*** 21,45 ****
#include "jlog/jlogTracker.h"
!
struct jlogTracker_s {
struct messHead_s *head; /**< message stack */
!
! jlogCallbackHandle_t *cb;
};
struct messNode_s {
! char *srcfile;
! char *srcfunc;
! int srcline;
! jlogModule_e module;
! jlogReportLevel_e reportLevel;
! int messageNumber;
! char *messageText;
! struct messNode_s *next;
};
struct messHead_s {
! int count;
! struct messNode_s *first;
};
--- 21,49 ----
#include "jlog/jlogTracker.h"
! /**
! * management structure for internal state information
! * for jlogTracker_t to work
! */
struct jlogTracker_s {
struct messHead_s *head; /**< message stack */
! jlogCallbackHandle_t *cb; /**< jlog callback handle */
};
+ /** local management structure for a single message */
struct messNode_s {
! char *srcfile; /**< source file */
! char *srcfunc; /**< source function */
! int srcline; /**< source line number */
! jlogModule_e module; /**< module message associated with */
! jlogReportLevel_e reportLevel; /**< reporting level of message */
! int messageNumber; /**< message number */
! char *messageText; /**< message text */
! struct messNode_s *next; /**< next message in queue */
};
+ /** local management structure for message queue */
struct messHead_s {
! int count; /**< number of messages */
! struct messNode_s *first; /**< pointer to first message */
};
***************
*** 147,150 ****
--- 151,157 ----
}
+ /**
+ * allocate new jlogTracker_t handle for use.
+ */
jlogTracker_t *
jlogTracker_create(void)
|
|
From: Jerry V. <jve...@us...> - 2003-08-28 15:25:04
|
Update of /cvsroot/libimdb/libimdb
In directory sc8-pr-cvs1:/tmp/cvs-serv20497
Modified Files:
TODO
Log Message:
a flurry of documentation done
Index: TODO
===================================================================
RCS file: /cvsroot/libimdb/libimdb/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TODO 21 Aug 2003 22:42:09 -0000 1.4
--- TODO 28 Aug 2003 15:25:00 -0000 1.5
***************
*** 11,15 ****
- how easy is it to nuke sysincludes.h ?
- jlog - put in mpatrol entry points to control on/off jlog
- - add MPATROL to README for soft requirements
- add doc target and produce doxygen api docs
- add doc_install target to copy to ../web
--- 11,14 ----
***************
*** 75,84 ****
dotty /tmp/mem.dot
# how do we use mpatrol with --fail-seed and --fail-freq to do memory
! # resource recovery code checks ? Need coverage analysis tools for starters.
! # (see Profiling below)
Profiling and Coverage analysis
! - add option for producing profiling output (add -pg to CFLAGS) see gcc man page
! and gcov - go look at bb.it perl script (I have elsewhere)
libjlog
--- 74,83 ----
dotty /tmp/mem.dot
# how do we use mpatrol with --fail-seed and --fail-freq to do memory
! # resource recovery code checks ? Need coverage analysis tools for
! # starters. (see Profiling below)
Profiling and Coverage analysis
! - add option for producing profiling output (add -pg to CFLAGS) see gcc
! man page and gcov - go look at bb.it perl script (I have elsewhere)
libjlog
|
|
From: Jerry V. <jve...@us...> - 2003-08-28 15:24:19
|
Update of /cvsroot/libimdb/libimdb/java In directory sc8-pr-cvs1:/tmp/cvs-serv20428 Modified Files: Makefile Log Message: a flurry of documentation done Index: Makefile =================================================================== RCS file: /cvsroot/libimdb/libimdb/java/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 21 Aug 2003 23:24:39 -0000 1.2 --- Makefile 28 Aug 2003 15:24:15 -0000 1.3 *************** *** 14,18 **** CCFLAGS_DROP=-Wmissing-prototypes ! CPPFLAGS += -DSWIG_NOINCLUDE -I. -I../include GENERATED_FILES=gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c --- 14,18 ---- CCFLAGS_DROP=-Wmissing-prototypes ! CPPFLAGS += -DSWIG_NOINCLUDE -I. -I../include $(JNI_CPPFLAGS) GENERATED_FILES=gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c |
|
From: Jerry V. <jve...@us...> - 2003-08-27 21:57:26
|
Update of /cvsroot/libimdb/web In directory sc8-pr-cvs1:/tmp/cvs-serv15125 Added Files: doxygen.cfg Log Message: initial doxygen.cfg before I start munging it --- NEW FILE: doxygen.cfg --- # Doxyfile 1.3 #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- PROJECT_NAME = PROJECT_NUMBER = OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO EXTRACT_ALL = NO EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = NO STRIP_FROM_PATH = INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES SHORT_NAMES = NO HIDE_SCOPE_NAMES = NO VERBATIM_HEADERS = YES SHOW_INCLUDE_FILES = YES JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES ALIASES = ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO SHOW_USED_FILES = YES #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = FILE_PATTERNS = RECURSIVE = NO EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = NO INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = NO COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = YES LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO XML_SCHEMA = XML_DTD = #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::addtions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO CLASS_GRAPH = YES COLLABORATION_GRAPH = YES TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 0 GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::addtions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO CGI_NAME = search.cgi CGI_URL = DOC_URL = DOC_ABSPATH = BIN_ABSPATH = /usr/local/bin/ EXT_DOC_PATHS = |
|
From: Jerry V. <jve...@us...> - 2003-08-22 09:43:21
|
Update of /cvsroot/libimdb/libimdb/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv6416
Modified Files:
imdbParser.c
Log Message:
listEntry_callback is now optional (parse testing)
Index: imdbParser.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/parser/imdbParser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** imdbParser.c 17 Aug 2003 16:41:51 -0000 1.2
--- imdbParser.c 21 Aug 2003 22:44:31 -0000 1.3
***************
*** 312,318 ****
#endif
! #define TO_END_OF_LINE -1
!
! static /*inline */int
deleteChars(struct line_s *line, int start, int length)
{
--- 312,316 ----
#endif
! static inline int
deleteChars(struct line_s *line, int start, int length)
{
***************
*** 322,339 ****
dumpLine(buf, line);
}*/
! if ( start == 0 ) {
! line->used-=length;
! memcpy(line->buf, line->buf+length, line->used);
! line->buf[line->used]='\0';
! }
! else if ( start+length == line->used ) {
line->used-=length;
line->buf[line->used]='\0';
}
else {
! /*memcpy(line->buf, line->buf, start-1);*/
! memcpy(line->buf+start-1, line->buf+start+length, line->used-length);
line->used-=length;
! line->buf[line->used]='\0';
}
/*{
--- 320,337 ----
dumpLine(buf, line);
}*/
! if ( start+length == line->used ) {
! /* simple truncation */
line->used-=length;
line->buf[line->used]='\0';
}
else {
! /* start may be 0 */
! char *s,*d;
!
line->used-=length;
! for (d=line->buf+start,s=d+length ; *s != '\0' ; *d++=*s++ ) {
! }
! *d='\0';
! assert(d-line->buf == line->used);
}
/*{
***************
*** 391,394 ****
--- 389,394 ----
}
+ #define TO_END_OF_LINE -1
+
static inline int
subLine(struct line_s *line, struct line_s *newline, int start, int length)
***************
*** 732,738 ****
entry.yearRomanNumberals=results.romanNumberalsInYear;
! ret=parser->listEntry_cb(logh, parser, LIST_MOVIES, &entry);
! if ( ret != 0 ) {
! /* stop parsing and return this error code */
parseAbortCode=ret;
break;
--- 732,738 ----
entry.yearRomanNumberals=results.romanNumberalsInYear;
! if ( parser->listEntry_cb != NULL &&
! (ret=parser->listEntry_cb(logh, parser, LIST_MOVIES, &entry)) != 0 ) {
! /* stop parsing and return this error code */
parseAbortCode=ret;
break;
***************
*** 1103,1111 ****
parser->stats.directorsList.numDirectors++;
! ret=parser->listEntry_cb(logh, parser, lf, &entry);
! if ( ret != 0 ) {
! /* stop parsing and return this error code */
! parseAbortCode=ret;
! break;
}
}
--- 1103,1111 ----
parser->stats.directorsList.numDirectors++;
! if ( parser->listEntry_cb != NULL &&
! (ret=parser->listEntry_cb(logh, parser, lf, &entry)) != 0 ) {;
! /* stop parsing and return this error code */
! parseAbortCode=ret;
! break;
}
}
***************
*** 1139,1144 ****
}
! ret=parser->listEntry_cb(logh, parser, lf, &entry);
! if ( ret != 0 ) {
/* stop parsing and return this error code */
parseAbortCode=ret;
--- 1139,1144 ----
}
! if ( parser->listEntry_cb != NULL &&
! (ret=parser->listEntry_cb(logh, parser, lf, &entry)) != 0 ) {
/* stop parsing and return this error code */
parseAbortCode=ret;
|
|
From: Jerry V. <jve...@us...> - 2003-08-22 02:07:50
|
Update of /cvsroot/libimdb/libimdb
In directory sc8-pr-cvs1:/tmp/cvs-serv13910
Modified Files:
constants.mk
Log Message:
added JLOG_CPPFLAGS, fixed JAVADOC -link location and added JLOG_PEDANTIC_MPATROL
Index: constants.mk
===================================================================
RCS file: /cvsroot/libimdb/libimdb/constants.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** constants.mk 16 Jun 2003 04:18:37 -0000 1.1
--- constants.mk 21 Aug 2003 20:34:42 -0000 1.2
***************
*** 72,81 ****
endif
- # WHOAMI_LINUX := /usr/bin/whoami
- # WHOAMI_CYGWIN := /bin/whoami
- # WHOAMI = $(WHOAMI_$(BUILD_OS))
- #
- # USER_NAME := $(shell $(WHOAMI))
-
CLASSPATH_SEP_CYGWIN :=;
CLASSPATH_SEP_LINUX :=:
--- 72,75 ----
***************
*** 102,106 ****
#createClassPath=$(subst $(space),$(CLASSPATH_SEP),$(strip $(1)))
-
AR_CYGWIN := /bin/ar
AR_LINUX := /usr/bin/ar
--- 96,99 ----
***************
*** 261,264 ****
--- 254,267 ----
CCFLAGS =$(filter-out $(CCFLAGS_DROP),$(CCFLAGS_$(CXX_COMPILER)) $(CCFLAGS_$(CXX_COMPILER)_BUILD_$(BUILD_OS)) $(CCFLAGS_$(CXX_COMPILER)_TARGET_$(TARGET_OS)) $(CCFLAGS_$(OBJS_TYPE)))
+ # The following settings are specific to the src/lib/libjlog library usage
+ # but are defined here for convenience. @see src/include/jlog/jlog.h for details.
+ #
+ # valid values are 'ARGUMENTS' 'LOCATION' and 'DISABLE'
+ #
+ JLOG_CPPFLAGS_LINUX :=-DJLOG_ENTER_DETAIL=ARGUMENTS -DJLOG_SUCCESS_DETAIL=LOCATION -DJLOG_FAILURE_DETAIL=LOCATION -DJLOG_DEBUG_DETAIL=ARGUMENTS
+ JLOG_CPPFLAGS_CYGWIN :=-DJLOG_ENTER_DETAIL=ARGUMENTS -DJLOG_SUCCESS_DETAIL=LOCATION -DJLOG_FAILURE_DETAIL=LOCATION -DJLOG_DEBUG_DETAIL=ARGUMENTS
+
+ JLOG_CPPFLAGS=$(JLOG_CPPFLAGS_$(TARGET_OS))
+
CPPFLAGS_gcc :=
***************
*** 267,271 ****
# $(error CPPFLAGS_$(CC_COMPILER)) was left undefined, fix constants.mk)
#endif
! CPPFLAGS =$(filter-out $(CPPFLAGS_DROP),$(CPPFLAGS_$(CC_COMPILER)) -D$(BUILD_OS) -D$(BUILD_OS_VERSION))
DATE_CYGWIN := /bin/date
--- 270,274 ----
# $(error CPPFLAGS_$(CC_COMPILER)) was left undefined, fix constants.mk)
#endif
! CPPFLAGS =$(filter-out $(CPPFLAGS_DROP),$(CPPFLAGS_$(CC_COMPILER)) -D$(BUILD_OS) -D$(BUILD_OS_VERSION) -DTARGET_OS="$(TARGET_OS)") $(JLOG_CPPFLAGS)
DATE_CYGWIN := /bin/date
***************
*** 393,397 ****
LD_DYNAMIC_FLAGS_ld_BUILD_LINUX =-shared -h $(basename $(@F))
! LD_DYNAMIC_FLAGS_gxx_TARGET_MINGW :=-mno-cygwin
LD_DYNAMIC_FLAGS=$(LD_DYNAMIC_FLAGS_$(LD_DYNAMIC_BASENAME)_BUILD_$(BUILD_OS)) \
--- 396,400 ----
LD_DYNAMIC_FLAGS_ld_BUILD_LINUX =-shared -h $(basename $(@F))
! LD_DYNAMIC_FLAGS_gcc_TARGET_MINGW :=-mno-cygwin
LD_DYNAMIC_FLAGS=$(LD_DYNAMIC_FLAGS_$(LD_DYNAMIC_BASENAME)_BUILD_$(BUILD_OS)) \
***************
*** 467,471 ****
# PERL_INCLUDE is used for building swig projects providing perl interfaces
! PERL_INCLUDE :=$(shell $(PERL) -e 'use Config; print "$$Config{archlib}/CORE";')
RSH_CYGWIN := /bin/rsh
--- 470,475 ----
# PERL_INCLUDE is used for building swig projects providing perl interfaces
! PERL_INCLUDE :=$(shell $(PERL) -e 'use Config; print "$$Config{archlib}/CORE";')
! PERL_LIBS :=$(shell $(PERL) -e 'use Config; print "$$Config{archlib}/CORE/libperl.a $$Config{libs}";')
RSH_CYGWIN := /bin/rsh
***************
*** 502,506 ****
# - requires JAVA_COMPILER be one of:
# SUNJava14
- # Do *not* use Jikes 1.13 -- it is broken.
#
ifeq "$(JAVA_COMPILER)" "SUNJava14"
--- 506,509 ----
***************
*** 605,613 ****
JAVA_SRCS_SOURCEPATH :=$(JAVA_SRCS_SOURCEPATH_$(BUILD_OS))
! JAVADOC_FLAGS_13 := -link http://web.interdynamix.com/~release/java/jdk1.3/docs/api
! JAVADOC_FLAGS_14 := -link http://web.interdynamix.com/~release/java/jdk1.4/docs/api -source 1.4
!
! JAVADOC_FLAGS_SUNJava14 := $(JAVADOC_FLAGS_14)
! JAVADOC_FLAGS_JIKES118 := $(JAVADOC_FLAGS_13)
JAVADOC_FLAGS = -use -private -splitIndex -version \
--- 608,612 ----
JAVA_SRCS_SOURCEPATH :=$(JAVA_SRCS_SOURCEPATH_$(BUILD_OS))
! JAVADOC_FLAGS_14 := -link http://java.sun.com/j2se/1.4.1/docs/api
JAVADOC_FLAGS = -use -private -splitIndex -version \
***************
*** 656,659 ****
--- 655,659 ----
endif
+ # define how dynamic libraries are to be named
MYDYNAMIC_CYGWIN =$(BUILD_DIR)/$(LIB_BASE).$(SO)
MYDYNAMIC_LINUX =$(BUILD_DIR)/lib$(LIB_BASE).$(SO).$(LIB_VERSION)
***************
*** 735,741 ****
--- 735,746 ----
# placing a value in MPATROL enables the use of
# mpatrol to check memory allocation.
+ # optional JLOG_PEDANTIC_MPATROL supported in jlog.h
+ # @todo - should we support a static link option ?
ifdef MPATROL
ifeq "$(BUILD_OS)" "LINUX"
CPPFLAGS+=-DMPATROL
+ ifdef JLOG_PEDANTIC_MPATROL
+ CPPFLAGS+=-DJLOG_PEDANTIC_MPATROL
+ endif
LIBS_LINK+=/usr/local/lib/libmpatrol.$(SO) -lbfd -liberty -ldl
else
***************
*** 743,747 ****
endif
endif
-
# don't put the dependency file in $(BUILD_DIR), because some projects
--- 748,751 ----
|
|
From: Jerry V. <jve...@us...> - 2003-08-21 23:32:51
|
Update of /cvsroot/libimdb/libimdb/java/org/libimdb/swig/gen In directory sc8-pr-cvs1:/tmp/cvs-serv12428/gen Log Message: Directory /cvsroot/libimdb/libimdb/java/org/libimdb/swig/gen added to the repository |
|
From: Jerry V. <jve...@us...> - 2003-08-21 23:32:51
|
Update of /cvsroot/libimdb/libimdb/java/gen_STATIC In directory sc8-pr-cvs1:/tmp/cvs-serv12601/gen_STATIC Log Message: Directory /cvsroot/libimdb/libimdb/java/gen_STATIC added to the repository |
|
From: Jerry V. <jve...@us...> - 2003-08-21 23:32:50
|
Update of /cvsroot/libimdb/libimdb/java/org/libimdb/swig/gen In directory sc8-pr-cvs1:/tmp/cvs-serv12488 Added Files: JLog.java JLogJNI.java Parser.java ParserJNI.java Log Message: added so swig installation is optional --- NEW FILE: JLog.java --- package org.libimdb.swig.gen; /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version: 1.3.19 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ public class JLog { public static org.libimdb.swig.JLog JLog_create() {return new org.libimdb.swig.JLog(JLogJNI.JLog_create());} public static int JLog_destroy(org.libimdb.swig.JLog jl) { return JLogJNI.JLog_destroy(org.libimdb.swig.JLog.getCPtr(jl)); } public static int JLog_setNotificationLevel(org.libimdb.swig.JLog jl, int level) { return JLogJNI.JLog_setNotificationLevel(org.libimdb.swig.JLog.getCPtr(jl), level); } // enums and constants public final static int JLOG_DEBUG = JLogJNI.get_JLOG_DEBUG(); public final static int JLOG_ERROR = JLogJNI.get_JLOG_ERROR(); public final static int JLOG_CRITICAL = JLogJNI.get_JLOG_CRITICAL(); } --- NEW FILE: JLogJNI.java --- package org.libimdb.swig.gen; /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version: 1.3.19 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ class JLogJNI { public final static native long JLog_create(); public final static native int JLog_destroy(long jarg1); public final static native int get_JLOG_DEBUG(); public final static native int get_JLOG_ERROR(); public final static native int get_JLOG_CRITICAL(); public final static native int JLog_setNotificationLevel(long jarg1, int jarg2); } --- NEW FILE: Parser.java --- package org.libimdb.swig.gen; /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version: 1.3.19 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ public class Parser { public static org.libimdb.swig.Parser imdbParser_create(/*jstype*/org.libimdb.swig.JLog jlogobject, String dbsDir) {return new org.libimdb.swig.Parser(ParserJNI.imdbParser_create(/*javain*/jlogobject, dbsDir));} public static int imdbParser_destroy(/*jstype*/org.libimdb.swig.JLog jlogobject, Object jparserobject) { return ParserJNI.imdbParser_destroy(/*javain*/jlogobject, jparserobject); } public static int imdbParser_dumpMovies(/*jstype*/org.libimdb.swig.JLog jlogobject, /*jstype*/org.libimdb.swig.Parser jparserobject, /*jstype*/org.libimdb.swig.ProgressListener jprogressobject) { return ParserJNI.imdbParser_dumpMovies(/*javain*/jlogobject, /*javain*/jparserobject, /*javain*/jprogressobject); } public static int imdbParser_dumpDirectors(/*jstype*/org.libimdb.swig.JLog jlogobject, /*jstype*/org.libimdb.swig.Parser jparserobject, /*jstype*/org.libimdb.swig.ProgressListener jprogressobject) { return ParserJNI.imdbParser_dumpDirectors(/*javain*/jlogobject, /*javain*/jparserobject, /*javain*/jprogressobject); } public static int imdbParser_dumpActors(/*jstype*/org.libimdb.swig.JLog jlogobject, /*jstype*/org.libimdb.swig.Parser jparserobject, /*jstype*/org.libimdb.swig.ProgressListener jprogressobject) { return ParserJNI.imdbParser_dumpActors(/*javain*/jlogobject, /*javain*/jparserobject, /*javain*/jprogressobject); } public static int imdbParser_dumpActresses(/*jstype*/org.libimdb.swig.JLog jlogobject, /*jstype*/org.libimdb.swig.Parser jparserobject, /*jstype*/org.libimdb.swig.ProgressListener jprogressobject) { return ParserJNI.imdbParser_dumpActresses(/*javain*/jlogobject, /*javain*/jparserobject, /*javain*/jprogressobject); } } --- NEW FILE: ParserJNI.java --- package org.libimdb.swig.gen; /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version: 1.3.19 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ public class ParserJNI { public final static native long imdbParser_create(/*jtype*/org.libimdb.swig.JLog jarg2, String jarg3); public final static native int imdbParser_destroy(/*jtype*/org.libimdb.swig.JLog jarg2, Object jarg3); public final static native int imdbParser_dumpMovies(/*jtype*/org.libimdb.swig.JLog jarg2, /*jtype*/org.libimdb.swig.Parser jarg3, /*jtype*/org.libimdb.swig.ProgressListener jarg4); public final static native int imdbParser_dumpDirectors(/*jtype*/org.libimdb.swig.JLog jarg2, /*jtype*/org.libimdb.swig.Parser jarg3, /*jtype*/org.libimdb.swig.ProgressListener jarg4); public final static native int imdbParser_dumpActors(/*jtype*/org.libimdb.swig.JLog jarg2, /*jtype*/org.libimdb.swig.Parser jarg3, /*jtype*/org.libimdb.swig.ProgressListener jarg4); public final static native int imdbParser_dumpActresses(/*jtype*/org.libimdb.swig.JLog jarg2, /*jtype*/org.libimdb.swig.Parser jarg3, /*jtype*/org.libimdb.swig.ProgressListener jarg4); } |
|
From: Jerry V. <jve...@us...> - 2003-08-21 23:32:49
|
Update of /cvsroot/libimdb/libimdb/java In directory sc8-pr-cvs1:/tmp/cvs-serv12625 Modified Files: Makefile Log Message: swig installation is option Index: Makefile =================================================================== RCS file: /cvsroot/libimdb/libimdb/java/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 16 Jun 2003 04:18:38 -0000 1.1 --- Makefile 21 Aug 2003 23:24:39 -0000 1.2 *************** *** 18,44 **** GENERATED_FILES=gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c build: $(GENERATED_FILES) $(MAKE) $(MYDYNAMIC) DYNAMIC=$(MYDYNAMIC) SRCS="$(SRCS) $(GENERATED_FILES)" ! mkdir -p $(BUILD_CFG) $(JAVAC) -d $(BUILD_CFG) $(JAVAC_FLAGS) -sourcepath org -classpath org `find org -name \*.java` gen_$(BUILD_OS)/JLog_swig.c: ! mkdir -p org/libimdb/swig/gen ! swig -java -module JLog -Wall -I. -I../include \ -package org.libimdb.swig.gen \ ! -o org/libimdb/swig/gen/JLog_swig.c JLog.swig ! mkdir -p gen_$(BUILD_OS) ! mv org/libimdb/swig/gen/JLog_swig.c gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c: ! mkdir -p org/libimdb/swig/gen ! swig -java -module Parser -Wall -I. -I../include \ -package org.libimdb.swig.gen \ ! -o org/libimdb/swig/gen/Parser_swig.c Parser.swig ! mkdir -p gen_$(BUILD_OS) ! mv org/libimdb/swig/gen/Parser_swig.c gen_$(BUILD_OS)/Parser_swig.c clobber:: ! $(RM) -rf $(BUILD_CFG) gen_$(OS) $(RM) -rf org/libimdb/swig/gen --- 18,69 ---- GENERATED_FILES=gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c + # + # @todo - find way so we don't invoke javac every time in build target... + # build: $(GENERATED_FILES) $(MAKE) $(MYDYNAMIC) DYNAMIC=$(MYDYNAMIC) SRCS="$(SRCS) $(GENERATED_FILES)" ! @[ -d $(BUILD_CFG) ] || $(MKPATH) $(BUILD_CFG) $(JAVAC) -d $(BUILD_CFG) $(JAVAC_FLAGS) -sourcepath org -classpath org `find org -name \*.java` gen_$(BUILD_OS)/JLog_swig.c: ! @[ -d $(@D) ] || $(MKPATH) $(@D) ! @if [ ! -f "$(SWIG)" -a -f "gen_STATIC/$(@F)" ] ; then \ ! cp gen_STATIC/$(@F) $@; \ ! else \ ! [ -d org/libimdb/swig/gen ] || $(MKPATH) org/libimdb/swig/gen ;\ ! $(ECHO) "generating $@..";\ ! swig -java -module JLog -Wall -I. -I../include \ -package org.libimdb.swig.gen \ ! -o org/libimdb/swig/gen/JLog_swig.c JLog.swig ;\ ! mv org/libimdb/swig/gen/JLog_swig.c $(@D)/JLog_swig.c ;\ ! $(CMP) -s $(@D)/JLog_swig.c gen_STATIC/JLog_swig.c ;\ ! if [ "$$?" -eq "0" ] ; then \ ! $(ECHO) "generated jni wrapper: gen_STATIC/JLog_swig.c is up-to-date" ;\ ! else \ ! $(ECHO) "WARNING: $(@D)/JLog_swig.c is different from gen_STATIC/JLog_swig.c" ;\ ! fi ;\ ! fi gen_$(BUILD_OS)/Parser_swig.c: ! @[ -d $(@D) ] || $(MKPATH) $(@D) ! @if [ ! -f "$(SWIG)" -a -f "gen_STATIC/$(@F)" ] ; then \ ! cp gen_STATIC/$(@F) $@; \ ! else \ ! [ -d org/libimdb/swig/gen ] || $(MKPATH) org/libimdb/swig/gen ;\ ! $(ECHO) "generating $@..";\ ! swig -java -module Parser -Wall -I. -I../include \ -package org.libimdb.swig.gen \ ! -o org/libimdb/swig/gen/Parser_swig.c Parser.swig ;\ ! mv org/libimdb/swig/gen/Parser_swig.c $(@D)/Parser_swig.c ;\ ! $(CMP) -s $(@D)/Parser_swig.c gen_STATIC/Parser_swig.c ;\ ! if [ "$$?" -eq "0" ] ; then \ ! $(ECHO) "generated jni wrapper: gen_STATIC/Parser_swig.c is up-to-date" ;\ ! else \ ! $(ECHO) "WARNING: $(@D)/Parser_swig.c is different from gen_STATIC/Parser_swig.c" ;\ ! fi ;\ ! fi clobber:: ! $(RM) -rf $(BUILD_CFG) gen_$(BUILD_OS) $(RM) -rf org/libimdb/swig/gen |
|
From: Jerry V. <jve...@us...> - 2003-08-21 23:32:49
|
Update of /cvsroot/libimdb/libimdb/java/gen_STATIC In directory sc8-pr-cvs1:/tmp/cvs-serv12625/gen_STATIC Added Files: JLog_swig.c Parser_swig.c Log Message: swig installation is option --- NEW FILE: JLog_swig.c --- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version 1.3.19 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make * changes to this file unless you know what you are doing--modify the SWIG * interface file instead. * ----------------------------------------------------------------------------- */ #if defined(__GNUC__) typedef long long __int64; /*For gcc on Windows */ #endif #include <jni.h> #include <stdlib.h> #include <string.h> /* Support for throwing Java exceptions */ typedef enum { SWIG_JavaOutOfMemoryError = 1, SWIG_JavaIOException, SWIG_JavaRuntimeException, SWIG_JavaIndexOutOfBoundsException, SWIG_JavaArithmeticException, SWIG_JavaIllegalArgumentException, SWIG_JavaNullPointerException, SWIG_JavaUnknownError } SWIG_JavaExceptionCodes; typedef struct { SWIG_JavaExceptionCodes code; const char *java_exception; } SWIG_JavaExceptions_t; #if defined(SWIG_NOINCLUDE) void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg); #else void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) { jclass excep; static const SWIG_JavaExceptions_t java_exceptions[] = { { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, { SWIG_JavaIOException, "java/io/IOException" }, { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, { SWIG_JavaUnknownError, "java/lang/UnknownError" }, { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } }; const SWIG_JavaExceptions_t *except_ptr = java_exceptions; while (except_ptr->code != code && except_ptr->code) except_ptr++; (*jenv)->ExceptionClear(jenv); excep = (*jenv)->FindClass(jenv, except_ptr->java_exception); if (excep) (*jenv)->ThrowNew(jenv, excep, msg); } #endif #define _USE_STDIO #define _USE_STDLIB #define _USE_STDARG #define _USE_TYPES #define _USE_STRINGS #define _USE_ASSERT #include "sysincludes.h" #include "jlog/jlog.h" #include "JLog_jni.h" #ifdef __cplusplus extern "C" { #endif JNIEXPORT jlong JNICALL Java_org_libimdb_swig_gen_JLogJNI_JLog_1create(JNIEnv *jenv, jclass jcls) { jlong jresult = 0 ; JLog_t *result; (void)jenv; (void)jcls; result = (JLog_t *)JLog_create(); *(JLog_t **)&jresult = result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_JLogJNI_JLog_1destroy(JNIEnv *jenv, jclass jcls, jlong jarg1) { jint jresult = 0 ; JLog_t *arg1 = (JLog_t *) 0 ; int result; (void)jenv; (void)jcls; arg1 = *(JLog_t **)&jarg1; result = (int)JLog_destroy(arg1); jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_JLogJNI_get_1JLOG_1DEBUG(JNIEnv *jenv, jclass jcls) { jint jresult = 0 ; int result; (void)jenv; (void)jcls; result = (int)JLOG_DEBUG; jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_JLogJNI_get_1JLOG_1ERROR(JNIEnv *jenv, jclass jcls) { jint jresult = 0 ; int result; (void)jenv; (void)jcls; result = (int)JLOG_ERROR; jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_JLogJNI_get_1JLOG_1CRITICAL(JNIEnv *jenv, jclass jcls) { jint jresult = 0 ; int result; (void)jenv; (void)jcls; result = (int)JLOG_CRITICAL; jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_JLogJNI_JLog_1setNotificationLevel(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) { jint jresult = 0 ; JLog_t *arg1 = (JLog_t *) 0 ; int arg2 ; int result; (void)jenv; (void)jcls; arg1 = *(JLog_t **)&jarg1; arg2 = (int)jarg2; result = (int)JLog_setNotificationLevel(arg1,(JLogReportLevel_e )arg2); jresult = (jint)result; return jresult; } #ifdef __cplusplus } #endif --- NEW FILE: Parser_swig.c --- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version 1.3.19 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make * changes to this file unless you know what you are doing--modify the SWIG * interface file instead. * ----------------------------------------------------------------------------- */ #if defined(__GNUC__) typedef long long __int64; /*For gcc on Windows */ #endif #include <jni.h> #include <stdlib.h> #include <string.h> /* Support for throwing Java exceptions */ typedef enum { SWIG_JavaOutOfMemoryError = 1, SWIG_JavaIOException, SWIG_JavaRuntimeException, SWIG_JavaIndexOutOfBoundsException, SWIG_JavaArithmeticException, SWIG_JavaIllegalArgumentException, SWIG_JavaNullPointerException, SWIG_JavaUnknownError } SWIG_JavaExceptionCodes; typedef struct { SWIG_JavaExceptionCodes code; const char *java_exception; } SWIG_JavaExceptions_t; #if defined(SWIG_NOINCLUDE) void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg); #else void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) { jclass excep; static const SWIG_JavaExceptions_t java_exceptions[] = { { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, { SWIG_JavaIOException, "java/io/IOException" }, { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, { SWIG_JavaUnknownError, "java/lang/UnknownError" }, { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } }; const SWIG_JavaExceptions_t *except_ptr = java_exceptions; while (except_ptr->code != code && except_ptr->code) except_ptr++; (*jenv)->ExceptionClear(jenv); excep = (*jenv)->FindClass(jenv, except_ptr->java_exception); if (excep) (*jenv)->ThrowNew(jenv, excep, msg); } #endif #define _USE_STDIO #define _USE_STDLIB #define _USE_TYPES #define _USE_STRINGS #define _USE_ASSERT #include "sysincludes.h" #include "jlog/parerr.h" #include "libimdb/parser.h" #include "JLog_jni.h" #include "Parser_jni.h" #ifdef __cplusplus extern "C" { #endif JNIEXPORT jlong JNICALL Java_org_libimdb_swig_gen_ParserJNI_imdbParser_1create(JNIEnv *jenv, jclass jcls, /*jni*/jobject jarg2, jstring jarg3) { jlong jresult = 0 ; JNIEnv *arg1 = (JNIEnv *) 0 ; jobject arg2 ; char *arg3 ; imdbParser_t *result; (void)jenv; (void)jcls; arg1=jenv; arg2=jarg2; { arg3 = 0; if (jarg3) { arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0); if (!arg3) return 0; } } result = (imdbParser_t *)imdbParser_create(arg1,arg2,arg3); *(imdbParser_t **)&jresult = result; { if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, arg3); } return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_ParserJNI_imdbParser_1destroy(JNIEnv *jenv, jclass jcls, /*jni*/jobject jarg2, jobject jarg3) { jint jresult = 0 ; JNIEnv *arg1 = (JNIEnv *) 0 ; jobject arg2 ; jobject arg3 ; int result; (void)jenv; (void)jcls; arg1=jenv; arg2=jarg2; arg3 = jarg3; result = (int)imdbParser_destroy(arg1,arg2,arg3); jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_ParserJNI_imdbParser_1dumpMovies(JNIEnv *jenv, jclass jcls, /*jni*/jobject jarg2, /*jni*/jobject jarg3, /*jni*/jobject jarg4) { jint jresult = 0 ; JNIEnv *arg1 = (JNIEnv *) 0 ; jobject arg2 ; jobject arg3 ; jobject arg4 ; int result; (void)jenv; (void)jcls; arg1=jenv; arg2=jarg2; arg3=jarg3; arg4=jarg4; result = (int)imdbParser_dumpMovies(arg1,arg2,arg3,arg4); jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_ParserJNI_imdbParser_1dumpDirectors(JNIEnv *jenv, jclass jcls, /*jni*/jobject jarg2, /*jni*/jobject jarg3, /*jni*/jobject jarg4) { jint jresult = 0 ; JNIEnv *arg1 = (JNIEnv *) 0 ; jobject arg2 ; jobject arg3 ; jobject arg4 ; int result; (void)jenv; (void)jcls; arg1=jenv; arg2=jarg2; arg3=jarg3; arg4=jarg4; result = (int)imdbParser_dumpDirectors(arg1,arg2,arg3,arg4); jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_ParserJNI_imdbParser_1dumpActors(JNIEnv *jenv, jclass jcls, /*jni*/jobject jarg2, /*jni*/jobject jarg3, /*jni*/jobject jarg4) { jint jresult = 0 ; JNIEnv *arg1 = (JNIEnv *) 0 ; jobject arg2 ; jobject arg3 ; jobject arg4 ; int result; (void)jenv; (void)jcls; arg1=jenv; arg2=jarg2; arg3=jarg3; arg4=jarg4; result = (int)imdbParser_dumpActors(arg1,arg2,arg3,arg4); jresult = (jint)result; return jresult; } JNIEXPORT jint JNICALL Java_org_libimdb_swig_gen_ParserJNI_imdbParser_1dumpActresses(JNIEnv *jenv, jclass jcls, /*jni*/jobject jarg2, /*jni*/jobject jarg3, /*jni*/jobject jarg4) { jint jresult = 0 ; JNIEnv *arg1 = (JNIEnv *) 0 ; jobject arg2 ; jobject arg3 ; jobject arg4 ; int result; (void)jenv; (void)jcls; arg1=jenv; arg2=jarg2; arg3=jarg3; arg4=jarg4; result = (int)imdbParser_dumpActresses(arg1,arg2,arg3,arg4); jresult = (jint)result; return jresult; } #ifdef __cplusplus } #endif |
|
From: Jerry V. <jve...@us...> - 2003-08-21 23:32:43
|
Update of /cvsroot/libimdb/libimdb/bin In directory sc8-pr-cvs1:/tmp/cvs-serv12805 Removed Files: swigdepend.pl swiggen.pl Log Message: no longer used --- swigdepend.pl DELETED --- --- swiggen.pl DELETED --- |
|
From: Jerry V. <jve...@us...> - 2003-08-21 22:45:21
|
Update of /cvsroot/libimdb/libimdb/libjlog
In directory sc8-pr-cvs1:/tmp/cvs-serv6615
Modified Files:
jlog.c jlog2File.c
Log Message:
improved jlog interface and compile-time options
Index: jlog.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/libjlog/jlog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jlog.c 16 Jun 2003 04:18:38 -0000 1.1
--- jlog.c 21 Aug 2003 22:45:18 -0000 1.2
***************
*** 26,37 ****
typedef struct mymod_s { jlogModule_e mod; char *str; } mymod_t;
- struct jlogCallbackHandle_s {
- jlog_eventCallback_t *cb; /**< callback function pointer */
-
- void *userdata; /**< extra client data that gets handed back in callbacks */
-
- jlogReportLevel_e callbackLevel[MOD_ALL+1]; /**< one set of flags for each MODule */
- } jlogCallback_t;
-
jlogCallbackHandle_t *
jlogCallback_create(jlog_eventCallback_t *cb,
--- 26,29 ----
***************
*** 83,125 ****
/**
- * log handle.
- */
- struct jlog_s {
- int h_refcount; /**< reference count */
- int h_neverUnallocate; /**< do no unallocate log_s struct ptr in log_close */
- #if TRACK_OPEN_FROM_WHERE
- struct whereInSource_s **h_openFromWhere;
- #endif
-
- int cbCount;
- jlogCallbackHandle_t **cb;
-
- jlogModule_e h_lastMessageModule[4]; /**< last module with error, one per level */
- int h_lastMessageNumber[4]; /**< last messageNumber, one per level */
-
- int h_appendEnterExit[MOD_ALL+1];
- int h_appendEnterExitNestedLevel;
- };
-
- static struct jlog_s defaultlog = {
- 0,
- 1,
- #if TRACK_OPEN_FROM_WHERE
- NULL,
- #endif
- 0, /*cbCount*/
- NULL /*cb list */,
-
- {MOD_NONE, MOD_NONE, MOD_NONE, MOD_NONE},
- {0,0,0,0},
- {0,0,0}, /* h_appendEnterExit[MOD_ALL+1] */
- 0, /* h_appendEnterExitNestedLevel */
- };
-
-
- /**
* register an event callback.
*
- * if logh is NULL, the callback is registered with the default logh.
* returns -1 on malloc failure
*/
--- 75,80 ----
***************
*** 131,143 ****
int i, total;
- /* logh missing means set default callback */
- if ( logh == NULL ) {
- logh=&defaultlog;
- }
- else if ( logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
if ( logh->cbCount == 0 ) {
logh->cb=malloc(sizeof(jlogCallbackHandle_t *));
--- 86,89 ----
***************
*** 177,189 ****
int i;
- /* logh missing means set default callback */
- if ( logh == NULL ) {
- logh=&defaultlog;
- }
- else if ( logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
if ( logh->cbCount == 0 ) {
return(-1);
--- 123,126 ----
***************
*** 202,217 ****
}
- /**
- * reset values to be consistant with default log settings
- * reset all buffers etc
- * warning: returned jlogHandle_t has h_neverUnallocate set to 1.
- */
- static void
- jlog_resetToDefault(jlogHandle_t *logh)
- {
- memcpy(logh, &defaultlog, sizeof(struct jlog_s));
- jlog_reset(logh);
- }
-
static long opens_g=0; /* number of logh instances currently open */
static long opens_ever_g=0; /* number of logh instances ever opened */
--- 139,142 ----
***************
*** 223,236 ****
* log handle. If reuseh is not NULL, reference count of logh is
* incremented and returned.
-
- * @todo TRACK_OPEN_FROM_WHERE should be enabled in log.c - prelimary support
- * for tracking where log_openMain was called. Problem with implementation is
- * we only track reuse of handle in subsequent calls to log_openMain with a
- * counter, so being able to pop/push may or may not work. Will need to push
- * logh handle down into private struct pointer and replace logh handle with
- * something that just tracks the real logh the ref counter to get information
- * about which where it was called. Storing the location information in the
- * logh handle gives us an easy way to identify the openMain calls in order.
- * Probably a back pointer is easier to manage.
*
* @todo document LOG_DEBUG_LEVEL and LOG_DEBUG_FILE environment variables
--- 148,151 ----
***************
*** 254,258 ****
/* if this is the first ever log_open call, then intrept
! LOG_DEBUG_LEVEL for settings in defaultlog */
#if 0
should be moved to log2File or logTracker
--- 169,173 ----
/* if this is the first ever log_open call, then intrept
! LOG_DEBUG_LEVEL for settings */
#if 0
should be moved to log2File or logTracker
***************
*** 297,301 ****
};
! int fm;
/* skip to next - or + */
--- 212,216 ----
};
! jlogModule_e mod;
/* skip to next - or + */
***************
*** 303,312 ****
env++;
}
! for ( fm=0 ; fm<=MOD_ALL ; fm++ ) {
! if ( strncmp(env+1, mods[fm].str, strlen(mods[fm].str)) == 0 ) {
break;
}
}
! if ( fm == MOD_ALL+1 ) {
env++;
/* not found, so skip to next - or + */
--- 218,227 ----
env++;
}
! for (mod=MOD_NONE ; mod <= MOD_ALL ;mod++ ) {
! if ( strncmp(env+1, mods[mod].str, strlen(mods[mod].str)) == 0 ) {
break;
}
}
! if ( mod == MOD_ALL+1 ) {
env++;
/* not found, so skip to next - or + */
***************
*** 317,333 ****
else {
if ( *env == '-' ) {
! if ( mods[fm].mod == MOD_ALL ) {
jlog_setAllModuleDebugFileLevels(NULL, LOGT_WARNING);
}
else {
! if ( defaultlog.h_dbflags[ mods[fm].mod] == LOGT_DEBUG ) {
! jlog_setModuleDebugFileLevel(NULL, mods[fm].mod, LOGT_WARNING);
! }
}
}
else {
! jlog_setModuleDebugFileLevel(NULL, mods[fm].mod, LOGT_DEBUG);
}
! env+=strlen(mods[fm].str)+1;
found++;
}
--- 232,246 ----
else {
if ( *env == '-' ) {
! if ( mods[mod].mod == MOD_ALL ) {
jlog_setAllModuleDebugFileLevels(NULL, LOGT_WARNING);
}
else {
! jlog_setModuleDebugFileLevel(NULL, mods[mod].mod, LOGT_WARNING);
}
}
else {
! jlog_setModuleDebugFileLevel(NULL, mods[mod].mod, LOGT_DEBUG);
}
! env+=strlen(mods[mod].str)+1;
found++;
}
***************
*** 393,414 ****
if ( reuseh != NULL ) {
- #if TRACK_OPEN_FROM_WHERE
- struct whereInSource_s **n;
-
- n=realloc_openFromWhere(reuseh->h_openFromWhere, reuseh->h_refcount,
- file, function, lineno);
- if ( n == NULL ) {
- /* malloc failure */
- return(NULL);
- }
- free_openFromWhere(reuseh->h_openFromWhere, reuseh->h_refcount);
- #endif
reuseh->h_refcount++;
- #if TRACK_OPEN_FROM_WHERE
- reuseh->h_openFromWhere=n;
- #endif
opens_ever_g++;
-
#if 0
if ( logdebug_g && reuseh->h_dbflags[MOD_LOG] >= LOGT_DEBUG ) {
--- 306,312 ----
***************
*** 425,444 ****
opens_ever_parents_g++;
! logh=malloc(sizeof(struct jlog_s));
if ( logh==NULL ) {
return(NULL);
}
! jlog_resetToDefault(logh);
! logh->h_refcount=1;
! logh->h_neverUnallocate=0;
! #if TRACK_OPEN_FROM_WHERE
! logh->h_openFromWhere==realloc_openFromWhere(NULL, 0, file, function, lineno);
! if ( n == NULL ) {
! /* malloc failure */
! free(logh)
! return(NULL);
}
! #endif
opens_g++;
opens_ever_g++;
--- 323,346 ----
opens_ever_parents_g++;
! logh=malloc(sizeof(struct jlogHandle_s));
if ( logh==NULL ) {
return(NULL);
}
! else {
! jlogModule_e mod;
! logh->h_refcount=1;
! logh->cbCount=0;
! logh->cb=NULL;
!
! for (mod=MOD_NONE ; mod <= MOD_ALL ;mod++ ) {
! logh->h_lastMessageModule[mod]=MOD_NONE;
! logh->h_lastMessageNumber[mod]=0;
! logh->enterReturn_cb[IS_ENTER][mod]=NULL;
! logh->enterReturn_cb[IS_SUCCESS][mod]=NULL;
! logh->enterReturn_cb[IS_FAILURE][mod]=NULL;
! }
}
!
opens_g++;
opens_ever_g++;
***************
*** 505,512 ****
}
- if ( logh->h_neverUnallocate == 1 ) {
- return(0);
- }
-
#if 0
if ( logdebug_g && logh->h_dbflags[MOD_LOG] >= LOGT_DEBUG ) {
--- 407,410 ----
***************
*** 569,577 ****
jlog_getModuleShortNames(const jlogHandle_t *logh)
{
- if ( logh && logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
return(mymods);
}
--- 467,470 ----
***************
*** 585,593 ****
jlogReportLevel_e level)
{
- if ( logh && logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
if ( logh==NULL ||
(level!=JLOGT_CRITICAL &&
--- 478,481 ----
***************
*** 610,618 ****
jlogReportLevel_e level)
{
- if ( logh && logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
if ( logh==NULL ||
(level!=JLOGT_CRITICAL &&
--- 498,501 ----
***************
*** 627,639 ****
jlog_reset(jlogHandle_t *logh)
{
! int i;
! for (i=0; i<4; i++ ) {
! logh->h_lastMessageModule[i]=MOD_NONE;
! logh->h_lastMessageNumber[i]=0;
}
return(0);
}
int
jlog_setModuleDebugEnterExit(jlogHandle_t *logh,
--- 510,523 ----
jlog_reset(jlogHandle_t *logh)
{
! jlogModule_e mod;
! for (mod=MOD_NONE ; mod <= MOD_ALL ;mod++ ) {
! logh->h_lastMessageModule[mod]=MOD_NONE;
! logh->h_lastMessageNumber[mod]=0;
}
return(0);
}
+ /*
int
jlog_setModuleDebugEnterExit(jlogHandle_t *logh,
***************
*** 655,659 ****
logh->h_appendEnterExit[MOD_ALL]=on;
return(l);
! }
static int
--- 539,543 ----
logh->h_appendEnterExit[MOD_ALL]=on;
return(l);
! }*/
static int
***************
*** 703,726 ****
va_list ap)
{
- struct jlog_s mylogh_static;
- jlogHandle_t *mylogh;
char fmtstr[MAXJLOGMSGLEN+1];
- if ( logh == NULL ) {
- /* use local struct since we don't want the overhead or
- re-allocating a new logh handle every time, let alone want
- to deal with memory problems :) */
- jlog_resetToDefault(&mylogh_static);
- mylogh=&mylogh_static;
- }
- else if ( logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
- else {
- mylogh=logh;
- }
-
if ( messageNumber != -1 ) {
logh->h_lastMessageModule[jlogReportLevel]=module;
--- 587,592 ----
***************
*** 730,734 ****
/* catch NULL error case */
if ( fmt==NULL ) {
! localfmt(mylogh, JLOGT_ERROR, MOD_JLG, 1,
srcfile, srcfunc, srcline, "call to log_fmt with NULL fmt string");
return(-1);
--- 596,600 ----
/* catch NULL error case */
if ( fmt==NULL ) {
! localfmt(logh, JLOGT_ERROR, MOD_JLG, 1,
srcfile, srcfunc, srcline, "call to log_fmt with NULL fmt string");
return(-1);
***************
*** 736,745 ****
if ( ap == NULL ) {
! return(localfmt(mylogh, jlogReportLevel, module, messageNumber, srcfile, srcfunc, srcline, fmt));
}
if ( vsnprintf(fmtstr, MAXJLOGMSGLEN, fmt, ap) < 0 ) {
fmtstr[MAXJLOGMSGLEN-1]='\0';
}
! return(localfmt(mylogh, jlogReportLevel, module, messageNumber, srcfile, srcfunc, srcline, fmtstr));
}
--- 602,611 ----
if ( ap == NULL ) {
! return(localfmt(logh, jlogReportLevel, module, messageNumber, srcfile, srcfunc, srcline, fmt));
}
if ( vsnprintf(fmtstr, MAXJLOGMSGLEN, fmt, ap) < 0 ) {
fmtstr[MAXJLOGMSGLEN-1]='\0';
}
! return(localfmt(logh, jlogReportLevel, module, messageNumber, srcfile, srcfunc, srcline, fmtstr));
}
***************
*** 761,769 ****
int ret;
- if ( logh && logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
va_start(args, fmt);
ret=jlog_fmt_arglist(logh, jlogReportLevel, module, messageNumber,
--- 627,630 ----
***************
*** 773,819 ****
}
- /**
- * Log the contents of a file. Calling log_fmt with each line separately.
- */
- int
- jlog_fmtfile(jlogHandle_t *logh,
- jlogReportLevel_e jlogReportLevel,
- jlogModule_e module,
- int messageNumber,
- const char *srcfile,
- const char *srcfunc,
- int srcline,
- const char *file)
- {
- FILE *fp;
- char line[MAXJLOGMSGLEN];
-
- if ( logh && logh->h_refcount < 0 ) {
- fprintf(stderr,"log handle invalid\n");
- fflush(stderr);
- abort();
- }
- if ( (fp=fopen(file, "rb")) == NULL ) {
- return(-1);
- }
- while ( fgets(line, MAXJLOGMSGLEN, fp) != NULL ) {
- if ( line[strlen(line)-1] == '\n' ) {
- line[strlen(line)-1]='\0';
- }
- if ( jlog_fmt(logh, jlogReportLevel, module, messageNumber, srcfile, srcfunc, srcline, line)!= 0) {
- fclose(fp);
- return(-1);
- }
- }
- fclose(fp);
- return(0);
- }
-
- typedef enum {
- IS_ENTER,
- IS_SUCCESS,
- IS_FAILURE
- } enterReturnType_e;
-
/**
* routine for logging function enter operations.
--- 634,637 ----
***************
*** 821,825 ****
static int
jlog_enterReturn(jlogHandle_t *logh,
- jlogReportLevel_e jlogReportLevel,
jlogModule_e module,
enterReturnType_e type,
--- 639,642 ----
***************
*** 913,941 ****
}
}
- fmtstr[--fmtstr_len]='\0';
! if ( type == IS_ENTER ) {
! logh->h_appendEnterExitNestedLevel++;
! }
! if ( logh->h_appendEnterExitNestedLevel > 0 ) {
! char buf[20];
! sprintf(buf, "%%-%ds", logh->h_appendEnterExitNestedLevel*2);
! fprintf(stderr, buf, " ");
! }
! if ( type != IS_ENTER ) {
! logh->h_appendEnterExitNestedLevel--;
! }
! switch(type) {
! case IS_ENTER:
! fprintf(stderr, "jlog_enter:%s:%d: calling %s(%s)\n", srcfile, srcline, srcfunc, fmtstr);
! break;
! case IS_SUCCESS:
! fprintf(stderr, "jlog_success:%s:%d: from %s(rval=%s)\n", srcfile, srcline, srcfunc, fmtstr);
! break;
! case IS_FAILURE:
! fprintf(stderr, "jlog_failure:%s:%d: from %s(rval=%s)\n", srcfile, srcline, srcfunc, fmtstr);
! break;
}
return(1);
--- 730,764 ----
}
}
! /* if ( type == IS_ENTER ) { */
! /* logh->h_appendEnterExitNestedLevel++; */
! /* } */
! /* if ( logh->h_appendEnterExitNestedLevel > 0 ) { */
! /* char buf[20]; */
! /* sprintf(buf, "%%-%ds", logh->h_appendEnterExitNestedLevel*2); */
! /* fprintf(stderr, buf, " "); */
! /* } */
! /* if ( type != IS_ENTER ) { */
! /* logh->h_appendEnterExitNestedLevel--; */
! /* } */
! if ( fmtstr_len == 0 ) {
! if ( logh->enterReturn_cb[type][module] != NULL ) {
! logh->enterReturn_cb[type][module](logh, srcfile, srcfunc, srcline, module, type, "");
! }
! if ( logh->enterReturn_cb[type][MOD_ALL] != NULL ) {
! logh->enterReturn_cb[type][MOD_ALL](logh, srcfile, srcfunc, srcline, module, type, "");
! }
!
! }
! else {
! fmtstr[--fmtstr_len]='\0';
! if ( logh->enterReturn_cb[type][module] != NULL ) {
! logh->enterReturn_cb[type][module](logh, srcfile, srcfunc, srcline, module, type, fmtstr);
! }
! if ( logh->enterReturn_cb[type][MOD_ALL] != NULL ) {
! logh->enterReturn_cb[type][MOD_ALL](logh, srcfile, srcfunc, srcline, module, type, fmtstr);
! }
}
return(1);
***************
*** 944,948 ****
int
jlog_enter(jlogHandle_t *logh,
- jlogReportLevel_e jlogReportLevel,
jlogModule_e module,
const char *srcfile,
--- 767,770 ----
***************
*** 951,991 ****
...)
{
! struct jlog_s mylogh_static;
! jlogHandle_t *mylogh;
!
! if ( logh == NULL ) {
! /* use local struct since we don't want the overhead or
! re-allocating a new logh handle every time, let alone want
! to deal with memory problems :) */
! jlog_resetToDefault(&mylogh_static);
! mylogh=&mylogh_static;
! }
! else if ( logh->h_refcount < 0 ) {
! fprintf(stderr,"log handle invalid\n");
! fflush(stderr);
! abort();
! }
! else {
! mylogh=logh;
! }
! if ( mylogh->h_appendEnterExit[module] == 0 &&
! mylogh->h_appendEnterExit[MOD_ALL] == 0 ) {
! return(0);
! }
! else {
! va_list args;
! int ret;
! va_start(args, srcfunc);
! ret=jlog_enterReturn(mylogh, jlogReportLevel, module, IS_ENTER, srcfile, srcline, srcfunc, args);
! va_end(args);
! return(ret);
! }
}
int
jlog_success(jlogHandle_t *logh,
- jlogReportLevel_e jlogReportLevel,
jlogModule_e module,
const char *srcfile,
--- 773,790 ----
...)
{
! va_list args;
! int ret;
! assert(logh != NULL);
! assert(logh->enterReturn_cb[IS_ENTER][module]!=NULL);
! va_start(args, srcfunc);
! ret=jlog_enterReturn(logh, module, IS_ENTER, srcfile, srcline, srcfunc, args);
! va_end(args);
! return(ret);
}
int
jlog_success(jlogHandle_t *logh,
jlogModule_e module,
const char *srcfile,
***************
*** 994,1034 ****
...)
{
! struct jlog_s mylogh_static;
! jlogHandle_t *mylogh;
!
! if ( logh == NULL ) {
! /* use local struct since we don't want the overhead or
! re-allocating a new logh handle every time, let alone want
! to deal with memory problems :) */
! jlog_resetToDefault(&mylogh_static);
! mylogh=&mylogh_static;
! }
! else if ( logh->h_refcount < 0 ) {
! fprintf(stderr,"log handle invalid\n");
! fflush(stderr);
! abort();
! }
! else {
! mylogh=logh;
! }
! if ( mylogh->h_appendEnterExit[module] == 0 &&
! mylogh->h_appendEnterExit[MOD_ALL] == 0 ) {
! return(0);
! }
! else {
! va_list args;
! int ret;
! va_start(args, srcfunc);
! ret=jlog_enterReturn(mylogh, jlogReportLevel, module, IS_SUCCESS, srcfile, srcline, srcfunc, args);
! va_end(args);
! return(ret);
! }
}
int
jlog_failure(jlogHandle_t *logh,
- jlogReportLevel_e jlogReportLevel,
jlogModule_e module,
const char *srcfile,
--- 793,810 ----
...)
{
! va_list args;
! int ret;
! assert(logh != NULL);
! assert(logh->enterReturn_cb[IS_SUCCESS][module]!=NULL);
! va_start(args, srcfunc);
! ret=jlog_enterReturn(logh, module, IS_SUCCESS, srcfile, srcline, srcfunc, args);
! va_end(args);
! return(ret);
}
int
jlog_failure(jlogHandle_t *logh,
jlogModule_e module,
const char *srcfile,
***************
*** 1037,1072 ****
...)
{
! struct jlog_s mylogh_static;
! jlogHandle_t *mylogh;
!
! if ( logh == NULL ) {
! /* use local struct since we don't want the overhead or
! re-allocating a new logh handle every time, let alone want
! to deal with memory problems :) */
! jlog_resetToDefault(&mylogh_static);
! mylogh=&mylogh_static;
! }
! else if ( logh->h_refcount < 0 ) {
! fprintf(stderr,"log handle invalid\n");
! fflush(stderr);
! abort();
! }
! else {
! mylogh=logh;
! }
! if ( mylogh->h_appendEnterExit[module] == 0 &&
! mylogh->h_appendEnterExit[MOD_ALL] == 0 ) {
! return(0);
! }
! else {
! va_list args;
! int ret;
! va_start(args, srcfunc);
! ret=jlog_enterReturn(mylogh, jlogReportLevel, module, IS_FAILURE, srcfile, srcline, srcfunc, args);
! va_end(args);
! return(ret);
! }
}
--- 813,826 ----
...)
{
! va_list args;
! int ret;
! assert(logh != NULL);
! assert(logh->enterReturn_cb[IS_FAILURE][module]!=NULL);
! va_start(args, srcfunc);
! ret=jlog_enterReturn(logh, module, IS_FAILURE, srcfile, srcline, srcfunc, args);
! va_end(args);
! return(ret);
}
Index: jlog2File.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/libjlog/jlog2File.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jlog2File.c 16 Jun 2003 04:18:38 -0000 1.1
--- jlog2File.c 21 Aug 2003 22:45:18 -0000 1.2
***************
*** 22,26 ****
struct jlog2File_s {
! char filename[MAXPATHLEN];
/* for private use */
--- 22,26 ----
struct jlog2File_s {
! char *filename;
/* for private use */
***************
*** 109,114 ****
return(NULL);
}
! assert(strlen(filename) < MAXPATHLEN);
! strcpy(lt->filename, filename);
lt->tval_s=0;
lt->tim[0]='\0';
--- 109,117 ----
return(NULL);
}
! lt->filename=strdup(filename);
! if ( lt->filename == NULL ) {
! free(lt);
! return(NULL);
! }
lt->tval_s=0;
lt->tim[0]='\0';
***************
*** 119,122 ****
--- 122,126 ----
if ( jlog2File_enable(lt) != 0 ) {
+ free(lt->filename);
free(lt);
return(NULL);
***************
*** 130,133 ****
--- 134,138 ----
{
jlog2File_disable(lt);
+ free(lt->filename);
free(lt);
return(0);
|
|
From: Jerry V. <jve...@us...> - 2003-08-21 22:45:11
|
Update of /cvsroot/libimdb/libimdb/java
In directory sc8-pr-cvs1:/tmp/cvs-serv6584
Modified Files:
JLog_jni.c
Log Message:
new jlog_open
Index: JLog_jni.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/java/JLog_jni.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JLog_jni.c 16 Jun 2003 04:18:38 -0000 1.1
--- JLog_jni.c 21 Aug 2003 22:45:08 -0000 1.2
***************
*** 56,60 ****
jl->jobj=NULL;
! jl->logh=jlog_openNew();
jl->jlog_cb=jlogCallback_create(jlog_eventCallback, jl);
--- 56,60 ----
jl->jobj=NULL;
! jl->logh=jlog_open(NULL);
jl->jlog_cb=jlogCallback_create(jlog_eventCallback, jl);
|
|
From: Jerry V. <jve...@us...> - 2003-08-21 22:43:32
|
Update of /cvsroot/libimdb/libimdb/demo/indexMovies
In directory sc8-pr-cvs1:/tmp/cvs-serv6223
Modified Files:
main.c
Log Message:
new jlog_open
Index: main.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/demo/indexMovies/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.c 16 Jun 2003 04:18:37 -0000 1.1
--- main.c 21 Aug 2003 22:43:18 -0000 1.2
***************
*** 20,24 ****
JLOGT_DEBUG)==0);
! logh=jlog_openNew();
jlog_registerEventCallback(logh, jlog2File_getJLogCallbackHandle(l2f));
--- 20,24 ----
JLOGT_DEBUG)==0);
! logh=jlog_open(NULL);
jlog_registerEventCallback(logh, jlog2File_getJLogCallbackHandle(l2f));
|
|
From: Jerry V. <jve...@us...> - 2003-08-21 22:43:02
|
Update of /cvsroot/libimdb/libimdb/demo/dumpMovies
In directory sc8-pr-cvs1:/tmp/cvs-serv6124
Modified Files:
main.c
Log Message:
more demo code changes
Index: main.c
===================================================================
RCS file: /cvsroot/libimdb/libimdb/demo/dumpMovies/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c 17 Aug 2003 16:41:02 -0000 1.2
--- main.c 21 Aug 2003 22:42:59 -0000 1.3
***************
*** 19,24 ****
case LIST_MOVIES: {
const struct MovieInList_s *data=entry;
! /*fprintf(stderr, "%d:type=%d, %s (%04d)\n", data->number, data->type, data->title, data->year);
! */
break;
}
--- 19,25 ----
case LIST_MOVIES: {
const struct MovieInList_s *data=entry;
! /*fprintf(stderr, "%d:type=%d, %s (%04d)\n", data->number, data->type, data->title, data->year);*/
! fprintf(stdout, "%d:type=%d, %s (%04d)\n", data->number, data->type, data->title, data->year);
! /*return(1);*/
break;
}
***************
*** 56,60 ****
JLOGT_ERROR)==0);
! logh=jlog_openNew();
jlog_registerEventCallback(logh, jlog2File_getJLogCallbackHandle(l2f));
--- 57,61 ----
JLOGT_ERROR)==0);
! logh=jlog_open(NULL);
jlog_registerEventCallback(logh, jlog2File_getJLogCallbackHandle(l2f));
***************
*** 62,65 ****
--- 63,67 ----
//log_setAllModuleDebugEnterExit(logh, 1);
+ //parser=imdbParser_open(logh, "./dbs", NULL);
parser=imdbParser_open(logh, "./dbs", ListEntry_cb);
if ( parser != NULL ) {
***************
*** 68,80 ****
}
}
! if ( 1 ) {
if ( imdbParser_directorsParse(logh, parser) == 0 ) {
}
}
! if ( 1 ) {
if ( imdbParser_actorsParse(logh, parser) == 0 ) {
}
}
! if ( 1 ) {
if ( imdbParser_actressesParse(logh, parser) == 0 ) {
}
--- 70,82 ----
}
}
! if ( 0 ) {
if ( imdbParser_directorsParse(logh, parser) == 0 ) {
}
}
! if ( 0 ) {
if ( imdbParser_actorsParse(logh, parser) == 0 ) {
}
}
! if ( 0 ) {
if ( imdbParser_actressesParse(logh, parser) == 0 ) {
}
|
|
From: Jerry V. <jve...@us...> - 2003-08-21 22:42:12
|
Update of /cvsroot/libimdb/libimdb
In directory sc8-pr-cvs1:/tmp/cvs-serv5967
Modified Files:
TODO README
Log Message:
updated for recent changes
Index: TODO
===================================================================
RCS file: /cvsroot/libimdb/libimdb/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TODO 17 Aug 2003 16:40:04 -0000 1.3
--- TODO 21 Aug 2003 22:42:09 -0000 1.4
***************
*** 8,19 ****
Short list to get things out.
- build env clean up
! - roll out basic c interface (imdbParser)
! - create api docs via doxygen
! - post to web
- roll out beta java interface - may require some reworking
of current prototype
! - will want to use something like mpatrol to assess what
! the memory requirements are for different parts of the
! library.
- need to version things.
libimdb_getVersion();
--- 8,24 ----
Short list to get things out.
- build env clean up
! - not sure what this means right now.
! - how easy is it to nuke sysincludes.h ?
! - jlog - put in mpatrol entry points to control on/off jlog
! - add MPATROL to README for soft requirements
! - add doc target and produce doxygen api docs
! - add doc_install target to copy to ../web
! - roll out beta release
! - clean up cvs repository
- roll out beta java interface - may require some reworking
of current prototype
!
! - look at strtab from mpatrol about hashtables of strings.
!
- need to version things.
libimdb_getVersion();
***************
*** 25,29 ****
- look at perl script to just get list files
! - look at perl script to get and merge list diff files.
Things to be done
--- 30,34 ----
- look at perl script to just get list files
! - could this have option to pull and apply diff files ?
Things to be done
***************
*** 57,63 ****
- probably pretty easy to support both.
! libjlog
! - optional compile time in/out features
- main log_open should initialize default
logtracker and logtee from env variables
--- 62,86 ----
- probably pretty easy to support both.
! mpatrol
! - can we use mpatrol to determine memory requirements
! for different parts of the library ?
! - create doc on how to do things with mpatrol
! - compile with MPATROL=yes env
! mpatrol --prof --prof-file=/tmp/dumpMovies.prof --log-all \
! --log-file=/tmp/dumpMovies.log --leak-table bdir-LINUX/dumpMovies
! # use mpsym to get more info in stack traces
! mpsym bdir-LINUX/dumpMovies /tmp/dumpMovies.log
! # add --check='-' for pedantic
! mprof --graph-file=/tmp/mem.dot /tmp/dumpMovies.prof
! dotty /tmp/mem.dot
! # how do we use mpatrol with --fail-seed and --fail-freq to do memory
! # resource recovery code checks ? Need coverage analysis tools for starters.
! # (see Profiling below)
!
! Profiling and Coverage analysis
! - add option for producing profiling output (add -pg to CFLAGS) see gcc man page
! and gcov - go look at bb.it perl script (I have elsewhere)
+ libjlog
- main log_open should initialize default
logtracker and logtee from env variables
***************
*** 70,90 ****
- config file
! - can mklog.pl generate/manage the list of
! modules supported ? Would require that
! enum gets initialized though.
! - one enum should always be MOD_OKAY=0
!
! - completely separate tree for jlog ?
!
! - can success/failure callback be combined
! with current callback mechanism ?
- support success call from void function
! - LOGerror_e should become LOGvalues_e
and include LOG_SUCCESS=0, enum value initializers
! should be negative for error
! - how can we get gcc to check __attribute()__ stuff ?
nuke build environment and re-write.
--- 93,106 ----
- config file
! + completely separate tree for jlog ? - ANSWER:no
- support success call from void function
! + LOGerror_e should become LOGvalues_e
and include LOG_SUCCESS=0, enum value initializers
! should be negative for error - ANSWER:leave for now
! - how can we get gcc to check __attribute()__ macros
! for us ?
nuke build environment and re-write.
***************
*** 94,97 ****
--- 110,120 ----
- could have basic configure at the top.
+ - need to add option for enabling MPATROL
+ - option for profiling as well
+ - options for JLOG_ controls
+ - can we configure java locations etc in config.mk
+ instead of configure ?
+
+ constants - minimize set of system utils needed
- swig generation should be separate target and
***************
*** 101,105 ****
with warnings if files end up lying around
! - cvs ci should include java generated c etc.
- can I or should I use sysinclude.h ?
--- 124,129 ----
with warnings if files end up lying around
! - swig should be optional, and we should check in
! generated sources.
- can I or should I use sysinclude.h ?
***************
*** 107,111 ****
cygwin for compiling into a dll.
! - clean up in order - remove NATIVE_WINDOWS
Utility for downloading/managing ftp list files
--- 131,135 ----
cygwin for compiling into a dll.
! - remove NATIVE_WINDOWS
Utility for downloading/managing ftp list files
Index: README
===================================================================
RCS file: /cvsroot/libimdb/libimdb/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README 16 Aug 2003 23:51:44 -0000 1.3
--- README 21 Aug 2003 22:42:09 -0000 1.4
***************
*** 8,11 ****
--- 8,12 ----
You'll need SWIG Version 1.3.19
+ You may want mpatrol (http://www.cbmamiga.demon.co.uk/mpatrol/index.html)
current status
|
|
From: Jerry V. <jve...@us...> - 2003-08-17 16:44:57
|
Update of /cvsroot/libimdb/libimdb/java
In directory sc8-pr-cvs1:/tmp/cvs-serv25067
Modified Files:
JLog_jni.h
Log Message:
tried out some exception call - disabled for now
Index: JLog_jni.h
===================================================================
RCS file: /cvsroot/libimdb/libimdb/java/JLog_jni.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JLog_jni.h 16 Jun 2003 04:18:38 -0000 1.1
--- JLog_jni.h 17 Aug 2003 16:44:54 -0000 1.2
***************
*** 20,23 ****
--- 20,36 ----
%apply (jobject jobj) {(jobject jobj)};
+ #ifdef I_CAN_GET_THIS_TO_WORK
+ /* problem is the jvm dumps when I the throw case actually gets triggered */
+ %exception JLog_create {
+ $action
+ if ( result == NULL ) {
+ jclass clazz = (*jenv)->FindClass(jenv, "org.libimdb.swig.JLogException");
+ (*jenv)->ThrowNew(jenv, clazz, "memory failed");
+ return $null;
+ }
+ };
+ #endif
+
+
#endif /* SWIGJAVA */
|
