X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=3fa1d7351c42d26488d6222920fc0b6427725c18;hp=e38e3b9b208464ad8b1753ddb778fe8bf52561b4;hb=2b85475321db7b38d4df0869fb51d38d98bb6671;hpb=f8128e98f2f4d61309fdb4b24e12eb33b08d630c

diff --git a/Remakefile.in b/Remakefile.in
index e38e3b9..3fa1d73 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -6,6 +6,7 @@ OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
 	$(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
 OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
+SRC = src
 BIN = src/@PACKAGE_TARNAME@.native@EXE@
 EXE = @EXE@
 
@@ -21,7 +22,7 @@ OCAMLYACC = @OCAMLYACC@
 
 all: $(BIN)
 
-tools: tools/xml_diff.native$(EXE) tools/XPathEval.class
+tools: tools/xml_diff.native$(EXE) tools/XPathEval.class tools/split_path.native$(EXE)
 
 Remakefile: Remakefile.in config.status
 	./config.status Remakefile
@@ -34,7 +35,7 @@ clean:
 	for dir in src tools; do
 		find $dir -name '*.cm*' -o -name '*.o' -o -name '*.byte' -o \
 			  -name '*.native' -o -name '*.mll' -o -name '*.mly' -o \
-			  -name '*.class' | while read file; do
+			  -name '*.class' -o -name '*.dep' | while read file; do
 		case "$file" in
 			*.mll)
 				rm -f "${file%.mll}.ml"
@@ -55,129 +56,82 @@ distclean: clean test_clean
 %.class: %.java
 	javac $<
 
-%.native$(EXE):
-	base=$*
-	src=${base}.ml
-	obj=${base}.cmx
-	dir=`dirname "$@"`
-	$(REMAKE) -v OCAMLDEPNATIVE=-native "$obj"
-	srcs=`ls "$dir"/*.cmx | sed 's/\.cmx/.ml/g'`
-	objs=`$(OCAMLDEP) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) -modules $srcs | tools/osort.sh cmx`
-	$(OCAMLOPT) -o "$@"  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objs
-
-%.byte$(EXE):
-	base=$*
-	src=${base}.ml
-	obj=${base}.cmo
-	dir=`dirname "$@"`
-	$(REMAKE) "$obj"
-	objs=""
-	for i in "$dir"/*.cmi; do
-		ibase=${i%.cmi}
-		if test -f "${ibase}.ml" -o -d "${ibase}" -o -f "${ibase}.mly" -o -f "${ibase}.mll"; then
-			objs="$objs ${ibase}.cmo"
-		fi
-	done
-	$(REMAKE) $objs
-	srcs=`ls "$dir"/*.cmo | sed 's/\.cmo/.ml/g'`
-	sorted_objs=`$(OCAMLDEP) $OCAMLFINDFLAGS -modules $srcs | tools/osort.sh cmo`
-	$(OCAMLC) -o "$@"  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $sorted_objs
-
-%.cmx:
-	target="$@"
-	base="${target%.cmx}"
-	src="${base}.ml"
-	if [ -f "$src" ]; then
-		$(REMAKE) "$src"
-		deps=`$(ODEPS) -native $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"`
-		echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
-		$(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFORPACK) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-	elif [ -d "$base" ];	then
-		modname=`basename "$base"`
-		packname=`echo "$modname" | sed 's/\(.*\)/\u\1/'`
-		objs=`ls "$base"/*.ml | sed 's/\.ml/.cmx/g'`
-		$(REMAKE) -v PACKINCLUDE="-I $base" -v OCAMLFORPACK="-for-pack $packname" $objs
-		sorted_objs=`$(OCAMLDEP) -native $(OCAMLFINDFLAGS) -I $base -modules "$base"/*.ml | tools/osort.sh cmx`
-		$(OCAMLOPT) -o "$target" -pack $sorted_objs
-	elif [ -f "$base".mly ]; then
-		$(REMAKE) "$base".mly
-		$(OCAMLYACC) "$base".mly
-                $(ODEPS) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) "$src" | \
-			$(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE=-native -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
-		$(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFORPACK) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-	fi
+%.native$(EXE): %.cmx %.dep
+	objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmx/g'`
+	$(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
 
+%.byte$(EXE): %.cmo %.dep
+	objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmo/g'`
+	$(OCAMLC) -o $@  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
 
-%.cmo:
-	target="$@"
-	base="${target%.cmo}"
-	src="${base}.ml"
-	if [ -f "$src" ]; then
-		$(REMAKE) "$src"
-		deps=`$(ODEPS) $OCAMLFINDFLAGS $PACKINCLUDE "$src"`
-		echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -r "$target"
-		$(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-	elif [ -d "$base" ];	then
-		modname=`basename "$base"`
-		packname=`echo "$modname" | sed 's/\(.*\)/\u\1/'`
-		objs=`ls "$base"/*.ml | sed 's/\.ml/.cmo/g'`
-		$(REMAKE) -v PACKINCLUDE="-I $base" $objs
-		sorted_objs=`$(OCAMLDEP) $(OCAMLFINDFLAGS) -I $base -modules "$base"/*.ml | tools/osort.sh cmo`
-		$(OCAMLC) -o "$target" -pack $sorted_objs
-	elif [ -f "$base".mly ]; then
-		$(REMAKE) "$base".mly
-		$(OCAMLYACC) "$base".mly
-                $(ODEPS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -r "$target"
-		$(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
+%.ml:
+	if test -f $*.mly; then
+		$(OCAMLYACC) $*.mly
+	elif test -f $*.mll; then
+		$(OCAMLLEX) $*.mll
 	fi
 
-
+%.cmx %.dep:
+	base=$*
+	target=$@
+	NATIVE=-native
+	REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+	. tools/ocamldriver.sh
+
+%.cmo %.dep:
+	base=$*
+	target=$@
+	NATIVE=
+	REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	SRC=$(SRC)
+	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+	. tools/ocamldriver.sh
 
 %.cmi:
-	target="$@"
-	base=${target%.cmi}
-	if test -f "$base".mli; then
-		$(REMAKE) "$base".mli
-		src=${base}.mli
-		deps=`$(ODEPS) $(OCAMLDEPNATIVE) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"`
-		echo "$deps" | $(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE="$(OCAMLDEPNATIVE)" -v OCAMLFORPACK="$(OCAMLFORPACK)" -r "$target"
-		if test -z "$(OCAMLDEPNATIVE)"; then
-			$(OCAMLC) -o "$target" -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-		else
-			$(OCAMLOPT) -o "$target" -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) "$src"
-		fi
+	$(REMAKE) $*.mli
+	if test -z "$(OCAMLNATIVE)"; then
+		$(OCAMLC) -c $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) $*.mli
 	else
-		if test -z "$(OCAMLDEPNATIVE)"; then
-		  obj=${base}.cmo
-		else
-		  obj=${base}.cmx
-		fi
-		$(REMAKE) -v PACKINCLUDE="$(PACKINCLUDE)" -v OCAMLDEPNATIVE="$(OCAMLDEPNATIVE)" -v OCAMLFORPACK="$(OCAMLFORPACK)" "$obj"
+		$(OCAMLOPT) -c $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $(PACKINCLUDE) $*.mli
+
 	fi
 
 ## Tests
 
-test:
+test: tools $(BIN)
 	for i in tests/*.xml
 	do
-		$(REMAKE) "$i".summary
+	  for j in 1 2 3
+	  do
+		$(REMAKE) "$i".test"$j".summary
+	  done
 	done
 
 test_clean:
-	rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)".*
+	rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
 
-%.summary:
-		base=`dirname "$@"`/`basename "$@" .xml.summary`
-		$(REMAKE) "$base".xml "$base".xml.queries tools "$(BIN)"
+%.test1.summary:
+		base="$@"
+		base=${base%.xml.test1.summary}
+		$(REMAKE) "$base".xml "$base".xml.queries
 		rm -f "$@"
+		MSG="Test 1 (single query: tatoo vs java implementation)"
+		echo "$MSG" >> "$@"
+		echo "$MSG"
 		cat "$base".xml.queries | grep -v '^#' | while read q query; do
 			echo -n "$base"".xml $q $query ... "
 			REF="$base".xml.results/"$q"_jaxp.xml
 			$(REMAKE) "$REF"
-			OUTPUT="$base".xml.results/"$q"_"$(PACKAGE)".xml
-			LOG="$base".xml.results/"$q"_"$(PACKAGE)".log
-			src/@PACKAGE_TARNAME@.native@EXE@ -s "$base".xml \
-				"$query" "$OUTPUT" > "$LOG" 2>&1
+			OUTPUT="$base".xml.results/"$q"_"$(PACKAGE)"_test1.xml
+			LOG="$base".xml.results/"$q"_"$(PACKAGE)"_test1.log
+			cp "$@" /tmp
+			src/@PACKAGE_TARNAME@.native@EXE@ -s -d "$base".xml \
+				"$query" -o "$OUTPUT" > "$LOG" 2>&1
+			cp "$@" /tmp
 			echo "Query: $q : $query" >> "$@"
 			cat  "$LOG" | grep '^STATS' >> "$@"
 			echo -n "Diff: " >> "$@"
@@ -191,3 +145,75 @@ test_clean:
 			fi
 			echo '-------------------------------------------' >> "$@"
 		done
+
+%.test2.summary:
+		base="$@"
+		base=${base%.xml.test2.summary}
+		$(REMAKE) "$base".xml "$base".xml.queries
+		rm -f "$@"
+		MSG="Test 2 (all queries sequentially vs all queries in parallel)"
+		echo "$MSG" >> "$@"
+		echo "$MSG"
+		allqueries=`cat "$base".xml.queries | grep -v '^#' | while read q query; do echo "'$query'"; done`
+		echo -n "Running all queries ... "
+		OUTPUTA="$base".xml.results/test2a_"$(PACKAGE)".xml
+		LOG="$base".xml.results/test2a_"$(PACKAGE)".log
+		echo -n "sequential ... "
+		echo "$allqueries" | xargs src/@PACKAGE_TARNAME@.native@EXE@ -s -d "$base".xml \
+		 -o "$OUTPUTA" > "$LOG" 2>&1
+		cat  "$LOG" | grep '^STATS' >> "$@"
+
+		OUTPUTB="$base".xml.results/test2b_"$(PACKAGE)".xml
+		LOG="$base".xml.results/test2b_"$(PACKAGE)".log
+		echo -n "parallel ... "
+		echo "$allqueries" | xargs src/@PACKAGE_TARNAME@.native@EXE@ -p -s -d "$base".xml \
+		 -o "$OUTPUTB" > "$LOG" 2>&1
+		cat  "$LOG" | grep '^STATS' >> "$@"
+			echo -n "Diff: " >> "$@"
+		if diff "$OUTPUTA" "$OUTPUTB" >/dev/null 2>&1; then
+			echo ok
+			echo ok >> "$@"
+		else
+			echo failed
+			echo failed >> "$@"
+			exit 1
+		fi
+		echo '-------------------------------------------' >> "$@"
+
+%.test3.summary:
+		base="$@"
+		base=${base%.xml.test3.summary}
+		$(REMAKE) "$base".xml "$base".xml.queries
+		rm -f "$@"
+		MSG="Test 3 (multiple queries composition: sequential vs parallel)"
+		echo "$MSG" >> "$@"
+		echo "$MSG"
+		cat "$base".xml.queries | grep -v '^#' | while read q query; do
+			echo -n "$base"".xml $q $query ... sequential ... "
+			OUTPUTA="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.xml
+			LOG="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.log
+			src/@PACKAGE_TARNAME@.native@EXE@ -s -d -C "$base".xml \
+				 -o "$OUTPUTA" $(tools/split_path.native$(EXE) "$query") > "$LOG" 2>&1
+			echo "Query: $q : $query" >> "$@"
+			cat  "$LOG" | grep '^STATS' >> "$@"
+
+			echo -n "parallel ... "
+			OUTPUTB="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.xml
+			LOG="$base".xml.results/"$q"_"$(PACKAGE)"_test3a.log
+			src/@PACKAGE_TARNAME@.native@EXE@ -s -d -p -C "$base".xml \
+				 -o "$OUTPUTB" $(tools/split_path.native$(EXE) "$query") > "$LOG" 2>&1
+			echo "Query: $q : $query" >> "$@"
+			cat  "$LOG" | grep '^STATS' >> "$@"
+
+
+			echo -n "Diff: " >> "$@"
+			if diff  "$OUTPUTA" "$OUTPUTB" >/dev/null 2>&1; then
+				echo ok
+				echo ok >> "$@"
+			else
+				echo failed
+				echo failed >> "$@"
+				exit 1
+			fi
+			echo '-------------------------------------------' >> "$@"
+		done