From a7eac661c77e7b763b9ceaaf78257054157e201b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Sat, 17 May 2014 22:55:27 +0800 Subject: [PATCH 01/30] Fix = operator in sh --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 93cee33..1ac5de3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -20,7 +20,7 @@ for l in glibtoolize libtoolize15 libtoolize14 libtoolize ; do echo "Did not find $l" done -if [ "x$libtoolize" == "x" ]; then +if [ "x$libtoolize" = "x" ]; then echo "Can't find libtoolize on your system" exit 1 fi From b7d3e8618144b4b1338e9d693bbe15decdb9c555 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:31:37 +0800 Subject: [PATCH 02/30] Add gvc to configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5abe1e2..f7408d1 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_FUNC_REALLOC AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(DEPS, [libpcre check]) +PKG_CHECK_MODULES(DEPS, [libpcre check gvc]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) AC_CONFIG_FILES([ From 14394010364572f68331732d6921086c2bf94476 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:34:51 +0800 Subject: [PATCH 03/30] Add gvc.c --- configure | 18 +++++++++--------- src/Makefile.am | 2 +- src/Makefile.in | 5 +++-- src/gvc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 src/gvc.c diff --git a/configure b/configure index f710333..0972494 100755 --- a/configure +++ b/configure @@ -13131,12 +13131,12 @@ if test -n "$DEPS_CFLAGS"; then pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check" 2>/dev/null` + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check gvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13148,12 +13148,12 @@ if test -n "$DEPS_LIBS"; then pkg_cv_DEPS_LIBS="$DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check" 2>/dev/null` + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check gvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13174,14 +13174,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check gvc" 2>&1` else - DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check gvc" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpcre check) were not met: + as_fn_error $? "Package requirements (libpcre check gvc) were not met: $DEPS_PKG_ERRORS diff --git a/src/Makefile.am b/src/Makefile.am index 230a1c4..e6711bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES=libr3.la -libr3_la_SOURCES=node.c edge.c list.c str.c token.c +libr3_la_SOURCES=node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD=$(DEPS_LIBS) AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index d1281ce..8f9af8f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo +am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvz.lo libr3_la_OBJECTS = $(am_libr3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la -libr3_la_SOURCES = node.c edge.c list.c str.c token.c +libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvz.c libr3_la_LIBADD = $(DEPS_LIBS) AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include all: all-am @@ -395,6 +395,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvz.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@ diff --git a/src/gvc.c b/src/gvc.c new file mode 100644 index 0000000..cd47844 --- /dev/null +++ b/src/gvc.c @@ -0,0 +1,44 @@ +/* + * gvz.c + * Copyright (C) 2014 c9s + * + * Distributed under terms of the MIT license. + */ + +#include +#include +#include +#include "r3.h" + +// int main(int argc, char **argv) +int r3_tree_render_file(node * tree, char * format, char * filename) +{ + Agraph_t *g; + Agnode_t *n, *m; + Agedge_t *e; + + /* set up a graphviz context - but only once even for multiple graphs */ + static GVC_t *gvc; + + if (!gvc) { + gvc = gvContext(); + } + + /* Create a simple digraph */ + g = agopen("g", Agdirected, 0); + + n = agnode(g, "n", 1); + m = agnode(g, "m", 1); + e = agedge(g, n, m, 0, 1); + + /* Set an attribute - in this case one that affects the visible rendering */ + agsafeset(n, "color", "red", ""); + /* Use the directed graph layout engine */ + gvLayout(gvc, g, "dot"); + gvRenderFilename(gvc, g, format, filename); + gvFreeLayout(gvc, g); + + agclose(g); + return 0; +} + From db9c3662f83ce4ea1029bac1cf0071ab2107844c Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:35:16 +0800 Subject: [PATCH 04/30] Update Makefile.in --- src/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 8f9af8f..73140e5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvz.lo +am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvc.lo libr3_la_OBJECTS = $(am_libr3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la -libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvz.c +libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD = $(DEPS_LIBS) AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include all: all-am @@ -395,7 +395,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvz.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@ From d462f4d5faa12f20c02ad0bc6a9444ab8c73a261 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:36:17 +0800 Subject: [PATCH 05/30] fix dep libgvc --- configure.ac | 2 +- include/r3.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f7408d1..d8a3972 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_FUNC_REALLOC AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(DEPS, [libpcre check gvc]) +PKG_CHECK_MODULES(DEPS, [libpcre check libgvc]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) AC_CONFIG_FILES([ diff --git a/include/r3.h b/include/r3.h index 1fdf51f..b33db9d 100644 --- a/include/r3.h +++ b/include/r3.h @@ -104,6 +104,8 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route void r3_tree_dump(node * n, int level); +int r3_tree_render_file(node * tree, char * format, char * filename); + edge * r3_node_find_edge_str(node * n, char * str, int str_len); @@ -129,4 +131,5 @@ match_entry * match_entry_create(char * path, int path_len); void match_entry_free(match_entry * entry); + #endif /* !NODE_H */ From dc861157cf44fe99988be4d3820b654aca92ad0f Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:04:24 +0800 Subject: [PATCH 06/30] Fix node pattern re-assignment --- src/node.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/node.c b/src/node.c index a4f6412..ad78171 100644 --- a/src/node.c +++ b/src/node.c @@ -420,9 +420,12 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route // printf("edge right: %s\n", e2->pattern); r3_tree_append_edge(e->child, e2); + + char *op = e->pattern; // truncate the original edge pattern - // e->pattern = strndup(e->pattern, dl); + e->pattern = strndup(e->pattern, dl); e->pattern_len = dl; + free(op); // move n->edges to c1 c2->endpoint++; From 9858c5cd5a23cc7fbebdf3ac0720407467a37f3d Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:13:58 +0800 Subject: [PATCH 07/30] Add gvc_render and gvc_render tests --- README.md | 2 +- config.status | 4 +-- configure | 18 +++++------ include/r3.h | 2 ++ src/gvc.c | 74 ++++++++++++++++++++++++++++++++++++++------ tests/Makefile.am | 7 ++++- tests/Makefile.in | 68 +++++++++++++++++++++++++++++++++++----- tests/bench_str.csv | 21 +++++++++++++ tests/check_gvc.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 241 insertions(+), 30 deletions(-) create mode 100644 tests/check_gvc.c diff --git a/README.md b/README.md index 365f5e2..d23f782 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ if ( $error ) { Install ---------------------- - sudo apt-get install check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 build-essential libtool automake autoconf + sudo apt-get install check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 build-essential libtool automake autoconf graphviz-dev graphviz ./autogen.sh ./configure && make make check # run tests diff --git a/config.status b/config.status index 4dd7970..917f241 100755 --- a/config.status +++ b/config.status @@ -816,8 +816,8 @@ cat >>"$ac_tmp/subs1.awk" <<\_ACAWK && S["am__EXEEXT_FALSE"]="" S["am__EXEEXT_TRUE"]="#" S["LTLIBOBJS"]="" -S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck " -S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include " +S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck -lgvc -lcgraph -lcdt " +S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include -I/opt/local/include/graphviz " S["PKG_CONFIG_LIBDIR"]="" S["PKG_CONFIG_PATH"]="" S["PKG_CONFIG"]="/opt/local/bin/pkg-config" diff --git a/configure b/configure index 0972494..c09ae98 100755 --- a/configure +++ b/configure @@ -13131,12 +13131,12 @@ if test -n "$DEPS_CFLAGS"; then pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check gvc" 2>/dev/null` + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check libgvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13148,12 +13148,12 @@ if test -n "$DEPS_LIBS"; then pkg_cv_DEPS_LIBS="$DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check gvc" 2>/dev/null` + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check libgvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13174,14 +13174,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check gvc" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check libgvc" 2>&1` else - DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check gvc" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check libgvc" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpcre check gvc) were not met: + as_fn_error $? "Package requirements (libpcre check libgvc) were not met: $DEPS_PKG_ERRORS diff --git a/include/r3.h b/include/r3.h index b33db9d..b8b2690 100644 --- a/include/r3.h +++ b/include/r3.h @@ -106,6 +106,8 @@ void r3_tree_dump(node * n, int level); int r3_tree_render_file(node * tree, char * format, char * filename); +int r3_tree_render_dot(node * tree); + edge * r3_node_find_edge_str(node * n, char * str, int str_len); diff --git a/src/gvc.c b/src/gvc.c index cd47844..8293c5b 100644 --- a/src/gvc.c +++ b/src/gvc.c @@ -10,12 +10,71 @@ #include #include "r3.h" -// int main(int argc, char **argv) + +char * node_id_str(int id) { + char * name = malloc(sizeof(char) * 20); + sprintf(name, "#%d", id); + return name; +} + +int r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt) { + edge * e; + Agnode_t *agn_child; + Agedge_t *agn_edge; + + for ( int i = 0 ; i < n->edge_len ; i++ ) { + e = n->edges[i]; + + node_cnt++; + agn_child = agnode(g, node_id_str(node_cnt) , 1); + agn_edge = agedge(g, ag_parent_node, agn_child, 0, 1); + agsafeset(agn_edge, "label", e->pattern, ""); + + r3_tree_build_ag_nodes(g, agn_child, e->child, node_cnt); + + // agedgeattr(agn_edge, "label", e->pattern ); + // agattr(gr, AGEDGE, "style","invis"); + // agattr(agn_edge, AGEDGE, "label", "test"); + } +} + + + + +/** + * Render a tree to tree graph image via graphviz (dot) + */ +int r3_tree_render_dot(node * tree) +{ + Agraph_t *g; + /* set up a graphviz context - but only once even for multiple graphs */ + static GVC_t *gvc; + + if (!gvc) { + gvc = gvContext(); + } + /* Create a simple digraph */ + g = agopen("g", Agdirected, 0); + + // create self node + Agnode_t *ag_root = agnode(g, "{root}", 1); + r3_tree_build_ag_nodes(g, ag_root, tree, 0); + gvLayout(gvc, g, "dot"); + gvRender(gvc, g, "dot", stdout); + gvFreeLayout(gvc, g); + agclose(g); + return 0; +} + + + + +/** + * Render a tree to tree graph image via graphviz (dot) + */ int r3_tree_render_file(node * tree, char * format, char * filename) { Agraph_t *g; - Agnode_t *n, *m; - Agedge_t *e; /* set up a graphviz context - but only once even for multiple graphs */ static GVC_t *gvc; @@ -27,13 +86,10 @@ int r3_tree_render_file(node * tree, char * format, char * filename) /* Create a simple digraph */ g = agopen("g", Agdirected, 0); - n = agnode(g, "n", 1); - m = agnode(g, "m", 1); - e = agedge(g, n, m, 0, 1); + // create self node + Agnode_t *ag_root = agnode(g, "{root}", 1); + r3_tree_build_ag_nodes(g, ag_root, tree, 0); - /* Set an attribute - in this case one that affects the visible rendering */ - agsafeset(n, "color", "red", ""); - /* Use the directed graph layout engine */ gvLayout(gvc, g, "dot"); gvRenderFilename(gvc, g, format, filename); gvFreeLayout(gvc, g); diff --git a/tests/Makefile.am b/tests/Makefile.am index 565646f..4bb69a5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,12 +4,17 @@ # else # TESTS = # endif -TESTS = check_tree +TESTS = check_tree check_gvc # noinst_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS) check_tree_SOURCES = check_tree.c bench.c check_tree_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ check_tree_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + +check_gvc_SOURCES = check_gvc.c bench.c +check_gvc_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +check_gvc_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include CLEANFILES = check_tree.log diff --git a/tests/Makefile.in b/tests/Makefile.in index 788b26d..1cea0f3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -77,7 +77,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -TESTS = check_tree$(EXEEXT) +TESTS = check_tree$(EXEEXT) check_gvc$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -93,16 +93,23 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = check_tree$(EXEEXT) -am_check_tree_OBJECTS = check_tree-check_tree.$(OBJEXT) \ - check_tree-bench.$(OBJEXT) -check_tree_OBJECTS = $(am_check_tree_OBJECTS) +am__EXEEXT_1 = check_tree$(EXEEXT) check_gvc$(EXEEXT) +am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \ + check_gvc-bench.$(OBJEXT) +check_gvc_OBJECTS = $(am_check_gvc_OBJECTS) am__DEPENDENCIES_1 = -check_tree_DEPENDENCIES = $(am__DEPENDENCIES_1) +check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +check_gvc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_gvc_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am_check_tree_OBJECTS = check_tree-check_tree.$(OBJEXT) \ + check_tree-bench.$(OBJEXT) +check_tree_OBJECTS = $(am_check_tree_OBJECTS) +check_tree_DEPENDENCIES = $(am__DEPENDENCIES_1) check_tree_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_tree_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -140,8 +147,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(check_tree_SOURCES) -DIST_SOURCES = $(check_tree_SOURCES) +SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES) +DIST_SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -495,6 +502,10 @@ top_srcdir = @top_srcdir@ check_tree_SOURCES = check_tree.c bench.c check_tree_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ check_tree_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ +check_gvc_SOURCES = check_gvc.c bench.c +check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include CLEANFILES = check_tree.log @@ -542,6 +553,10 @@ clean-checkPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +check_gvc$(EXEEXT): $(check_gvc_OBJECTS) $(check_gvc_DEPENDENCIES) $(EXTRA_check_gvc_DEPENDENCIES) + @rm -f check_gvc$(EXEEXT) + $(AM_V_CCLD)$(check_gvc_LINK) $(check_gvc_OBJECTS) $(check_gvc_LDADD) $(LIBS) + check_tree$(EXEEXT): $(check_tree_OBJECTS) $(check_tree_DEPENDENCIES) $(EXTRA_check_tree_DEPENDENCIES) @rm -f check_tree$(EXEEXT) $(AM_V_CCLD)$(check_tree_LINK) $(check_tree_OBJECTS) $(check_tree_LDADD) $(LIBS) @@ -552,6 +567,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gvc-bench.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gvc-check_gvc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tree-bench.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tree-check_tree.Po@am__quote@ @@ -576,6 +593,34 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +check_gvc-check_gvc.o: check_gvc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-check_gvc.o -MD -MP -MF $(DEPDIR)/check_gvc-check_gvc.Tpo -c -o check_gvc-check_gvc.o `test -f 'check_gvc.c' || echo '$(srcdir)/'`check_gvc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-check_gvc.Tpo $(DEPDIR)/check_gvc-check_gvc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_gvc.c' object='check_gvc-check_gvc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-check_gvc.o `test -f 'check_gvc.c' || echo '$(srcdir)/'`check_gvc.c + +check_gvc-check_gvc.obj: check_gvc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-check_gvc.obj -MD -MP -MF $(DEPDIR)/check_gvc-check_gvc.Tpo -c -o check_gvc-check_gvc.obj `if test -f 'check_gvc.c'; then $(CYGPATH_W) 'check_gvc.c'; else $(CYGPATH_W) '$(srcdir)/check_gvc.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-check_gvc.Tpo $(DEPDIR)/check_gvc-check_gvc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_gvc.c' object='check_gvc-check_gvc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-check_gvc.obj `if test -f 'check_gvc.c'; then $(CYGPATH_W) 'check_gvc.c'; else $(CYGPATH_W) '$(srcdir)/check_gvc.c'; fi` + +check_gvc-bench.o: bench.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-bench.o -MD -MP -MF $(DEPDIR)/check_gvc-bench.Tpo -c -o check_gvc-bench.o `test -f 'bench.c' || echo '$(srcdir)/'`bench.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-bench.Tpo $(DEPDIR)/check_gvc-bench.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bench.c' object='check_gvc-bench.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-bench.o `test -f 'bench.c' || echo '$(srcdir)/'`bench.c + +check_gvc-bench.obj: bench.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-bench.obj -MD -MP -MF $(DEPDIR)/check_gvc-bench.Tpo -c -o check_gvc-bench.obj `if test -f 'bench.c'; then $(CYGPATH_W) 'bench.c'; else $(CYGPATH_W) '$(srcdir)/bench.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-bench.Tpo $(DEPDIR)/check_gvc-bench.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bench.c' object='check_gvc-bench.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-bench.obj `if test -f 'bench.c'; then $(CYGPATH_W) 'bench.c'; else $(CYGPATH_W) '$(srcdir)/bench.c'; fi` + check_tree-check_tree.o: check_tree.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_tree_CFLAGS) $(CFLAGS) -MT check_tree-check_tree.o -MD -MP -MF $(DEPDIR)/check_tree-check_tree.Tpo -c -o check_tree-check_tree.o `test -f 'check_tree.c' || echo '$(srcdir)/'`check_tree.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_tree-check_tree.Tpo $(DEPDIR)/check_tree-check_tree.Po @@ -810,6 +855,13 @@ check_tree.log: check_tree$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +check_gvc.log: check_gvc$(EXEEXT) + @p='check_gvc$(EXEEXT)'; \ + b='check_gvc'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ diff --git a/tests/bench_str.csv b/tests/bench_str.csv index ed47d96..c8d18d2 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -57,3 +57,24 @@ 1400283485,10742869.09 1400283755,11545078.70 1400284307,11493777.72 +1400370342,11414560.92 +1400370407,10759059.85 +1400370448,10686226.48 +1400370672,10532221.14 +1400370683,10874340.04 +1400370920,11307031.13 +1400371082,9136908.63 +1400371092,11106355.37 +1400371132,11313608.81 +1400371165,10266146.59 +1400371326,10644609.51 +1400371371,10958943.43 +1400371431,10145302.26 +1400371504,11383090.96 +1400371511,10023676.85 +1400371561,10912042.58 +1400371589,11439666.09 +1400371602,11012616.42 +1400371709,11058171.50 +1400371751,11091926.38 +1400371943,11103873.79 diff --git a/tests/check_gvc.c b/tests/check_gvc.c new file mode 100644 index 0000000..4c41f74 --- /dev/null +++ b/tests/check_gvc.c @@ -0,0 +1,75 @@ +/* + * check_gvc.c + * Copyright (C) 2014 c9s + * + * Distributed under terms of the MIT license. + */ +#include "config.h" +#include +#include +#include +#include "r3.h" +#include "r3_str.h" +#include "str_array.h" +#include "bench.h" + +START_TEST (test_gvc_render_dot) +{ + node * n = r3_tree_create(1); + + r3_tree_insert_path(n, "/foo/bar/baz", NULL); + r3_tree_insert_path(n, "/foo/bar/qux", NULL); + r3_tree_insert_path(n, "/foo/bar/quux", NULL); + r3_tree_insert_path(n, "/foo/bar/corge", NULL); + r3_tree_insert_path(n, "/foo/bar/grault", NULL); + r3_tree_insert_path(n, "/garply/grault/foo", NULL); + r3_tree_insert_path(n, "/garply/grault/bar", NULL); + + r3_tree_compile(n); + + r3_tree_render_dot(n); + + r3_tree_free(n); +} +END_TEST + +START_TEST (test_gvc_render_file) +{ + + node * n = r3_tree_create(1); + + r3_tree_insert_path(n, "/foo/bar/baz", NULL); + r3_tree_insert_path(n, "/foo/bar/qux", NULL); + r3_tree_insert_path(n, "/foo/bar/quux", NULL); + r3_tree_insert_path(n, "/foo/bar/corge", NULL); + r3_tree_insert_path(n, "/foo/bar/grault", NULL); + r3_tree_insert_path(n, "/garply/grault/foo", NULL); + r3_tree_insert_path(n, "/garply/grault/bar", NULL); + + r3_tree_compile(n); + + r3_tree_render_file(n, "png", "check_gvc.png"); + + r3_tree_free(n); +} +END_TEST + + +Suite* r3_suite (void) { + Suite *suite = suite_create("gvc test"); + TCase *tcase = tcase_create("test_gvc"); + tcase_add_test(tcase, test_gvc_render_file); + tcase_add_test(tcase, test_gvc_render_dot); + suite_add_tcase(suite, tcase); + return suite; +} + +int main (int argc, char *argv[]) { + int number_failed; + Suite *suite = r3_suite(); + SRunner *runner = srunner_create(suite); + srunner_run_all(runner, CK_NORMAL); + number_failed = srunner_ntests_failed(runner); + srunner_free(runner); + return number_failed; +} From 27e8998ab36d0ded9d259ce52b8d5468b58504f5 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:31:37 +0800 Subject: [PATCH 08/30] Add gvc to configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5abe1e2..f7408d1 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_FUNC_REALLOC AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(DEPS, [libpcre check]) +PKG_CHECK_MODULES(DEPS, [libpcre check gvc]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) AC_CONFIG_FILES([ From 52aa2217101e02f61a3e21b8b52a6971220e276e Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:34:51 +0800 Subject: [PATCH 09/30] Add gvc.c --- configure | 18 +++++++++--------- src/Makefile.am | 2 +- src/Makefile.in | 5 +++-- src/gvc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 src/gvc.c diff --git a/configure b/configure index f710333..0972494 100755 --- a/configure +++ b/configure @@ -13131,12 +13131,12 @@ if test -n "$DEPS_CFLAGS"; then pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check" 2>/dev/null` + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check gvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13148,12 +13148,12 @@ if test -n "$DEPS_LIBS"; then pkg_cv_DEPS_LIBS="$DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check" 2>/dev/null` + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check gvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13174,14 +13174,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check gvc" 2>&1` else - DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check gvc" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpcre check) were not met: + as_fn_error $? "Package requirements (libpcre check gvc) were not met: $DEPS_PKG_ERRORS diff --git a/src/Makefile.am b/src/Makefile.am index 230a1c4..e6711bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES=libr3.la -libr3_la_SOURCES=node.c edge.c list.c str.c token.c +libr3_la_SOURCES=node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD=$(DEPS_LIBS) AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index d1281ce..8f9af8f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo +am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvz.lo libr3_la_OBJECTS = $(am_libr3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la -libr3_la_SOURCES = node.c edge.c list.c str.c token.c +libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvz.c libr3_la_LIBADD = $(DEPS_LIBS) AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include all: all-am @@ -395,6 +395,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvz.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@ diff --git a/src/gvc.c b/src/gvc.c new file mode 100644 index 0000000..cd47844 --- /dev/null +++ b/src/gvc.c @@ -0,0 +1,44 @@ +/* + * gvz.c + * Copyright (C) 2014 c9s + * + * Distributed under terms of the MIT license. + */ + +#include +#include +#include +#include "r3.h" + +// int main(int argc, char **argv) +int r3_tree_render_file(node * tree, char * format, char * filename) +{ + Agraph_t *g; + Agnode_t *n, *m; + Agedge_t *e; + + /* set up a graphviz context - but only once even for multiple graphs */ + static GVC_t *gvc; + + if (!gvc) { + gvc = gvContext(); + } + + /* Create a simple digraph */ + g = agopen("g", Agdirected, 0); + + n = agnode(g, "n", 1); + m = agnode(g, "m", 1); + e = agedge(g, n, m, 0, 1); + + /* Set an attribute - in this case one that affects the visible rendering */ + agsafeset(n, "color", "red", ""); + /* Use the directed graph layout engine */ + gvLayout(gvc, g, "dot"); + gvRenderFilename(gvc, g, format, filename); + gvFreeLayout(gvc, g); + + agclose(g); + return 0; +} + From 06c3b95e6c10fa0d445910456e63d3ec42f748e7 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:35:16 +0800 Subject: [PATCH 10/30] Update Makefile.in --- src/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 8f9af8f..73140e5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvz.lo +am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvc.lo libr3_la_OBJECTS = $(am_libr3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la -libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvz.c +libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD = $(DEPS_LIBS) AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include all: all-am @@ -395,7 +395,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvz.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@ From d46d189e95da3ab03d892b1f6af10107c8458c76 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 07:36:17 +0800 Subject: [PATCH 11/30] fix dep libgvc --- configure.ac | 2 +- include/r3.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f7408d1..d8a3972 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_FUNC_REALLOC AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(DEPS, [libpcre check gvc]) +PKG_CHECK_MODULES(DEPS, [libpcre check libgvc]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) AC_CONFIG_FILES([ diff --git a/include/r3.h b/include/r3.h index 1fdf51f..b33db9d 100644 --- a/include/r3.h +++ b/include/r3.h @@ -104,6 +104,8 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route void r3_tree_dump(node * n, int level); +int r3_tree_render_file(node * tree, char * format, char * filename); + edge * r3_node_find_edge_str(node * n, char * str, int str_len); @@ -129,4 +131,5 @@ match_entry * match_entry_create(char * path, int path_len); void match_entry_free(match_entry * entry); + #endif /* !NODE_H */ From b7c4829c2b8f3b864f7f66cb21872943845523ad Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:04:24 +0800 Subject: [PATCH 12/30] Fix node pattern re-assignment --- src/node.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/node.c b/src/node.c index a4f6412..ad78171 100644 --- a/src/node.c +++ b/src/node.c @@ -420,9 +420,12 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route // printf("edge right: %s\n", e2->pattern); r3_tree_append_edge(e->child, e2); + + char *op = e->pattern; // truncate the original edge pattern - // e->pattern = strndup(e->pattern, dl); + e->pattern = strndup(e->pattern, dl); e->pattern_len = dl; + free(op); // move n->edges to c1 c2->endpoint++; From b7d20ecc242318862cf87c585f06320d538ba5fe Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:13:58 +0800 Subject: [PATCH 13/30] Add gvc_render and gvc_render tests --- README.md | 2 +- config.status | 4 +-- configure | 18 +++++------ include/r3.h | 2 ++ src/gvc.c | 74 ++++++++++++++++++++++++++++++++++++++------ tests/Makefile.am | 7 ++++- tests/Makefile.in | 68 +++++++++++++++++++++++++++++++++++----- tests/bench_str.csv | 21 +++++++++++++ tests/check_gvc.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 241 insertions(+), 30 deletions(-) create mode 100644 tests/check_gvc.c diff --git a/README.md b/README.md index 365f5e2..d23f782 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ if ( $error ) { Install ---------------------- - sudo apt-get install check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 build-essential libtool automake autoconf + sudo apt-get install check libpcre3 libpcre3-dev libjemalloc-dev libjemalloc1 build-essential libtool automake autoconf graphviz-dev graphviz ./autogen.sh ./configure && make make check # run tests diff --git a/config.status b/config.status index 4dd7970..917f241 100755 --- a/config.status +++ b/config.status @@ -816,8 +816,8 @@ cat >>"$ac_tmp/subs1.awk" <<\_ACAWK && S["am__EXEEXT_FALSE"]="" S["am__EXEEXT_TRUE"]="#" S["LTLIBOBJS"]="" -S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck " -S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include " +S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck -lgvc -lcgraph -lcdt " +S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include -I/opt/local/include/graphviz " S["PKG_CONFIG_LIBDIR"]="" S["PKG_CONFIG_PATH"]="" S["PKG_CONFIG"]="/opt/local/bin/pkg-config" diff --git a/configure b/configure index 0972494..c09ae98 100755 --- a/configure +++ b/configure @@ -13131,12 +13131,12 @@ if test -n "$DEPS_CFLAGS"; then pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check gvc" 2>/dev/null` + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check libgvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13148,12 +13148,12 @@ if test -n "$DEPS_LIBS"; then pkg_cv_DEPS_LIBS="$DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check gvc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check gvc") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check gvc" 2>/dev/null` + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check libgvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13174,14 +13174,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check gvc" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check libgvc" 2>&1` else - DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check gvc" 2>&1` + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check libgvc" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpcre check gvc) were not met: + as_fn_error $? "Package requirements (libpcre check libgvc) were not met: $DEPS_PKG_ERRORS diff --git a/include/r3.h b/include/r3.h index b33db9d..b8b2690 100644 --- a/include/r3.h +++ b/include/r3.h @@ -106,6 +106,8 @@ void r3_tree_dump(node * n, int level); int r3_tree_render_file(node * tree, char * format, char * filename); +int r3_tree_render_dot(node * tree); + edge * r3_node_find_edge_str(node * n, char * str, int str_len); diff --git a/src/gvc.c b/src/gvc.c index cd47844..8293c5b 100644 --- a/src/gvc.c +++ b/src/gvc.c @@ -10,12 +10,71 @@ #include #include "r3.h" -// int main(int argc, char **argv) + +char * node_id_str(int id) { + char * name = malloc(sizeof(char) * 20); + sprintf(name, "#%d", id); + return name; +} + +int r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt) { + edge * e; + Agnode_t *agn_child; + Agedge_t *agn_edge; + + for ( int i = 0 ; i < n->edge_len ; i++ ) { + e = n->edges[i]; + + node_cnt++; + agn_child = agnode(g, node_id_str(node_cnt) , 1); + agn_edge = agedge(g, ag_parent_node, agn_child, 0, 1); + agsafeset(agn_edge, "label", e->pattern, ""); + + r3_tree_build_ag_nodes(g, agn_child, e->child, node_cnt); + + // agedgeattr(agn_edge, "label", e->pattern ); + // agattr(gr, AGEDGE, "style","invis"); + // agattr(agn_edge, AGEDGE, "label", "test"); + } +} + + + + +/** + * Render a tree to tree graph image via graphviz (dot) + */ +int r3_tree_render_dot(node * tree) +{ + Agraph_t *g; + /* set up a graphviz context - but only once even for multiple graphs */ + static GVC_t *gvc; + + if (!gvc) { + gvc = gvContext(); + } + /* Create a simple digraph */ + g = agopen("g", Agdirected, 0); + + // create self node + Agnode_t *ag_root = agnode(g, "{root}", 1); + r3_tree_build_ag_nodes(g, ag_root, tree, 0); + gvLayout(gvc, g, "dot"); + gvRender(gvc, g, "dot", stdout); + gvFreeLayout(gvc, g); + agclose(g); + return 0; +} + + + + +/** + * Render a tree to tree graph image via graphviz (dot) + */ int r3_tree_render_file(node * tree, char * format, char * filename) { Agraph_t *g; - Agnode_t *n, *m; - Agedge_t *e; /* set up a graphviz context - but only once even for multiple graphs */ static GVC_t *gvc; @@ -27,13 +86,10 @@ int r3_tree_render_file(node * tree, char * format, char * filename) /* Create a simple digraph */ g = agopen("g", Agdirected, 0); - n = agnode(g, "n", 1); - m = agnode(g, "m", 1); - e = agedge(g, n, m, 0, 1); + // create self node + Agnode_t *ag_root = agnode(g, "{root}", 1); + r3_tree_build_ag_nodes(g, ag_root, tree, 0); - /* Set an attribute - in this case one that affects the visible rendering */ - agsafeset(n, "color", "red", ""); - /* Use the directed graph layout engine */ gvLayout(gvc, g, "dot"); gvRenderFilename(gvc, g, format, filename); gvFreeLayout(gvc, g); diff --git a/tests/Makefile.am b/tests/Makefile.am index 565646f..4bb69a5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,12 +4,17 @@ # else # TESTS = # endif -TESTS = check_tree +TESTS = check_tree check_gvc # noinst_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS) check_tree_SOURCES = check_tree.c bench.c check_tree_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ check_tree_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + +check_gvc_SOURCES = check_gvc.c bench.c +check_gvc_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +check_gvc_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include CLEANFILES = check_tree.log diff --git a/tests/Makefile.in b/tests/Makefile.in index 788b26d..1cea0f3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -77,7 +77,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -TESTS = check_tree$(EXEEXT) +TESTS = check_tree$(EXEEXT) check_gvc$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -93,16 +93,23 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = check_tree$(EXEEXT) -am_check_tree_OBJECTS = check_tree-check_tree.$(OBJEXT) \ - check_tree-bench.$(OBJEXT) -check_tree_OBJECTS = $(am_check_tree_OBJECTS) +am__EXEEXT_1 = check_tree$(EXEEXT) check_gvc$(EXEEXT) +am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \ + check_gvc-bench.$(OBJEXT) +check_gvc_OBJECTS = $(am_check_gvc_OBJECTS) am__DEPENDENCIES_1 = -check_tree_DEPENDENCIES = $(am__DEPENDENCIES_1) +check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +check_gvc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_gvc_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am_check_tree_OBJECTS = check_tree-check_tree.$(OBJEXT) \ + check_tree-bench.$(OBJEXT) +check_tree_OBJECTS = $(am_check_tree_OBJECTS) +check_tree_DEPENDENCIES = $(am__DEPENDENCIES_1) check_tree_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_tree_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -140,8 +147,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(check_tree_SOURCES) -DIST_SOURCES = $(check_tree_SOURCES) +SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES) +DIST_SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -495,6 +502,10 @@ top_srcdir = @top_srcdir@ check_tree_SOURCES = check_tree.c bench.c check_tree_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ check_tree_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ +check_gvc_SOURCES = check_gvc.c bench.c +check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include CLEANFILES = check_tree.log @@ -542,6 +553,10 @@ clean-checkPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +check_gvc$(EXEEXT): $(check_gvc_OBJECTS) $(check_gvc_DEPENDENCIES) $(EXTRA_check_gvc_DEPENDENCIES) + @rm -f check_gvc$(EXEEXT) + $(AM_V_CCLD)$(check_gvc_LINK) $(check_gvc_OBJECTS) $(check_gvc_LDADD) $(LIBS) + check_tree$(EXEEXT): $(check_tree_OBJECTS) $(check_tree_DEPENDENCIES) $(EXTRA_check_tree_DEPENDENCIES) @rm -f check_tree$(EXEEXT) $(AM_V_CCLD)$(check_tree_LINK) $(check_tree_OBJECTS) $(check_tree_LDADD) $(LIBS) @@ -552,6 +567,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gvc-bench.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gvc-check_gvc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tree-bench.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tree-check_tree.Po@am__quote@ @@ -576,6 +593,34 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +check_gvc-check_gvc.o: check_gvc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-check_gvc.o -MD -MP -MF $(DEPDIR)/check_gvc-check_gvc.Tpo -c -o check_gvc-check_gvc.o `test -f 'check_gvc.c' || echo '$(srcdir)/'`check_gvc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-check_gvc.Tpo $(DEPDIR)/check_gvc-check_gvc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_gvc.c' object='check_gvc-check_gvc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-check_gvc.o `test -f 'check_gvc.c' || echo '$(srcdir)/'`check_gvc.c + +check_gvc-check_gvc.obj: check_gvc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-check_gvc.obj -MD -MP -MF $(DEPDIR)/check_gvc-check_gvc.Tpo -c -o check_gvc-check_gvc.obj `if test -f 'check_gvc.c'; then $(CYGPATH_W) 'check_gvc.c'; else $(CYGPATH_W) '$(srcdir)/check_gvc.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-check_gvc.Tpo $(DEPDIR)/check_gvc-check_gvc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_gvc.c' object='check_gvc-check_gvc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-check_gvc.obj `if test -f 'check_gvc.c'; then $(CYGPATH_W) 'check_gvc.c'; else $(CYGPATH_W) '$(srcdir)/check_gvc.c'; fi` + +check_gvc-bench.o: bench.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-bench.o -MD -MP -MF $(DEPDIR)/check_gvc-bench.Tpo -c -o check_gvc-bench.o `test -f 'bench.c' || echo '$(srcdir)/'`bench.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-bench.Tpo $(DEPDIR)/check_gvc-bench.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bench.c' object='check_gvc-bench.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-bench.o `test -f 'bench.c' || echo '$(srcdir)/'`bench.c + +check_gvc-bench.obj: bench.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -MT check_gvc-bench.obj -MD -MP -MF $(DEPDIR)/check_gvc-bench.Tpo -c -o check_gvc-bench.obj `if test -f 'bench.c'; then $(CYGPATH_W) 'bench.c'; else $(CYGPATH_W) '$(srcdir)/bench.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_gvc-bench.Tpo $(DEPDIR)/check_gvc-bench.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bench.c' object='check_gvc-bench.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_gvc_CFLAGS) $(CFLAGS) -c -o check_gvc-bench.obj `if test -f 'bench.c'; then $(CYGPATH_W) 'bench.c'; else $(CYGPATH_W) '$(srcdir)/bench.c'; fi` + check_tree-check_tree.o: check_tree.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_tree_CFLAGS) $(CFLAGS) -MT check_tree-check_tree.o -MD -MP -MF $(DEPDIR)/check_tree-check_tree.Tpo -c -o check_tree-check_tree.o `test -f 'check_tree.c' || echo '$(srcdir)/'`check_tree.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_tree-check_tree.Tpo $(DEPDIR)/check_tree-check_tree.Po @@ -810,6 +855,13 @@ check_tree.log: check_tree$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +check_gvc.log: check_gvc$(EXEEXT) + @p='check_gvc$(EXEEXT)'; \ + b='check_gvc'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ diff --git a/tests/bench_str.csv b/tests/bench_str.csv index ed47d96..c8d18d2 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -57,3 +57,24 @@ 1400283485,10742869.09 1400283755,11545078.70 1400284307,11493777.72 +1400370342,11414560.92 +1400370407,10759059.85 +1400370448,10686226.48 +1400370672,10532221.14 +1400370683,10874340.04 +1400370920,11307031.13 +1400371082,9136908.63 +1400371092,11106355.37 +1400371132,11313608.81 +1400371165,10266146.59 +1400371326,10644609.51 +1400371371,10958943.43 +1400371431,10145302.26 +1400371504,11383090.96 +1400371511,10023676.85 +1400371561,10912042.58 +1400371589,11439666.09 +1400371602,11012616.42 +1400371709,11058171.50 +1400371751,11091926.38 +1400371943,11103873.79 diff --git a/tests/check_gvc.c b/tests/check_gvc.c new file mode 100644 index 0000000..4c41f74 --- /dev/null +++ b/tests/check_gvc.c @@ -0,0 +1,75 @@ +/* + * check_gvc.c + * Copyright (C) 2014 c9s + * + * Distributed under terms of the MIT license. + */ +#include "config.h" +#include +#include +#include +#include "r3.h" +#include "r3_str.h" +#include "str_array.h" +#include "bench.h" + +START_TEST (test_gvc_render_dot) +{ + node * n = r3_tree_create(1); + + r3_tree_insert_path(n, "/foo/bar/baz", NULL); + r3_tree_insert_path(n, "/foo/bar/qux", NULL); + r3_tree_insert_path(n, "/foo/bar/quux", NULL); + r3_tree_insert_path(n, "/foo/bar/corge", NULL); + r3_tree_insert_path(n, "/foo/bar/grault", NULL); + r3_tree_insert_path(n, "/garply/grault/foo", NULL); + r3_tree_insert_path(n, "/garply/grault/bar", NULL); + + r3_tree_compile(n); + + r3_tree_render_dot(n); + + r3_tree_free(n); +} +END_TEST + +START_TEST (test_gvc_render_file) +{ + + node * n = r3_tree_create(1); + + r3_tree_insert_path(n, "/foo/bar/baz", NULL); + r3_tree_insert_path(n, "/foo/bar/qux", NULL); + r3_tree_insert_path(n, "/foo/bar/quux", NULL); + r3_tree_insert_path(n, "/foo/bar/corge", NULL); + r3_tree_insert_path(n, "/foo/bar/grault", NULL); + r3_tree_insert_path(n, "/garply/grault/foo", NULL); + r3_tree_insert_path(n, "/garply/grault/bar", NULL); + + r3_tree_compile(n); + + r3_tree_render_file(n, "png", "check_gvc.png"); + + r3_tree_free(n); +} +END_TEST + + +Suite* r3_suite (void) { + Suite *suite = suite_create("gvc test"); + TCase *tcase = tcase_create("test_gvc"); + tcase_add_test(tcase, test_gvc_render_file); + tcase_add_test(tcase, test_gvc_render_dot); + suite_add_tcase(suite, tcase); + return suite; +} + +int main (int argc, char *argv[]) { + int number_failed; + Suite *suite = r3_suite(); + SRunner *runner = srunner_create(suite); + srunner_run_all(runner, CK_NORMAL); + number_failed = srunner_ntests_failed(runner); + srunner_free(runner); + return number_failed; +} From 48f6255fbc42c5693ab88b575e33011dff52b8bb Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:19:32 +0800 Subject: [PATCH 14/30] document graphviz feature --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index d23f782..9053db8 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,28 @@ end ``` +Rendering routes with graphviz +------------------------------- + +The `test_gvc_render_file` API let you render the whole route trie into a image. + +[Imgur](http://i.imgur.com/J2LdzeK.png) + +Or you can even export it with dot format: + +```dot +digraph g { + graph [bb="0,0,205.1,471"]; + node [label="\N"]; + "{root}" [height=0.5, + pos="35.097,453", + width=0.97491]; + "#1" [height=0.5, + pos="35.097,366", + width=0.75]; + .... +``` + Use case in PHP ----------------------- From 87f8cb810ae558742aca25f875362e3e7346af2c Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:21:09 +0800 Subject: [PATCH 15/30] Fix image markdown --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9053db8..46db6bc 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Rendering routes with graphviz The `test_gvc_render_file` API let you render the whole route trie into a image. -[Imgur](http://i.imgur.com/J2LdzeK.png) +![Imgur](http://i.imgur.com/J2LdzeK.png) Or you can even export it with dot format: From 00c3b32ad5413c56249f66c1d3ba219c770af23c Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:28:45 +0800 Subject: [PATCH 16/30] update benchmark result. --- tests/bench_str.csv | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/bench_str.csv b/tests/bench_str.csv index c8d18d2..c552326 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -78,3 +78,10 @@ 1400371709,11058171.50 1400371751,11091926.38 1400371943,11103873.79 +1400372774,10613683.19 +1400372795,11841766.62 +1400372820,12690699.18 +1400372836,11596848.23 +1400372848,11541418.97 +1400372904,12034679.40 +1400372910,12755936.07 From c1d90dd138de2e3e855b71d1742decf9cf03c89d Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:29:26 +0800 Subject: [PATCH 17/30] performance improvement on plain string edge matching --- include/r3.h | 2 ++ src/gvc.c | 2 +- src/node.c | 13 ++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/r3.h b/include/r3.h index b8b2690..0ab0a7c 100644 --- a/include/r3.h +++ b/include/r3.h @@ -13,6 +13,7 @@ #include #include #include +#include #include "str_array.h" @@ -133,5 +134,6 @@ match_entry * match_entry_create(char * path, int path_len); void match_entry_free(match_entry * entry); +void r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt); #endif /* !NODE_H */ diff --git a/src/gvc.c b/src/gvc.c index 8293c5b..5d28d8d 100644 --- a/src/gvc.c +++ b/src/gvc.c @@ -17,7 +17,7 @@ char * node_id_str(int id) { return name; } -int r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt) { +void r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt) { edge * e; Agnode_t *agn_child; Agedge_t *agn_edge; diff --git a/src/node.c b/src/node.c index ad78171..1262110 100644 --- a/src/node.c +++ b/src/node.c @@ -299,12 +299,19 @@ node * r3_tree_match(node * n, char * path, int path_len, match_entry * entry) { inline edge * r3_node_find_edge_str(node * n, char * str, int str_len) { int i = 0; + int matched_idx = 0; + for (; i < n->edge_len ; i++ ) { - info("matching '%s' with '%s'\n", str, node_edge_pattern(n,i) ); - if ( strncmp( node_edge_pattern(n,i), str, node_edge_pattern_len(n,i) ) == 0 ) { - return n->edges[i]; + if ( *str == *(n->edges[i]->pattern) ) { + matched_idx = i; + break; } } + + // info("matching '%s' with '%s'\n", str, node_edge_pattern(n,i) ); + if ( strncmp( node_edge_pattern(n,matched_idx), str, node_edge_pattern_len(n,matched_idx) ) == 0 ) { + return n->edges[matched_idx]; + } return NULL; } From 4f882b8a7d01cd631c98b51ed213d310ae36804f Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:33:31 +0800 Subject: [PATCH 18/30] newrecord~ --- tests/bench_str.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/bench_str.csv b/tests/bench_str.csv index c552326..c3bb149 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -85,3 +85,4 @@ 1400372848,11541418.97 1400372904,12034679.40 1400372910,12755936.07 +1400373185,13716181.30 From 097a180f8c48fb26898ac1bc75e8326d142109d7 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 08:55:49 +0800 Subject: [PATCH 19/30] update record --- tests/bench_str.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/bench_str.csv b/tests/bench_str.csv index c3bb149..3e57663 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -86,3 +86,4 @@ 1400372904,12034679.40 1400372910,12755936.07 1400373185,13716181.30 +1400374415,13164892.40 From 02197595c91a3be48be9f459d548159ceac4d39d Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 09:05:55 +0800 Subject: [PATCH 20/30] Rename dl => offset for readiblity --- src/Makefile.am | 2 +- src/Makefile.in | 2 +- src/node.c | 40 +++++++++++++++++++--------------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e6711bc..5a9efa3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES=libr3.la libr3_la_SOURCES=node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD=$(DEPS_LIBS) -AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include +AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall # AM_CFLAGS=$(DEPS_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index 73140e5..f9a89cf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD = $(DEPS_LIBS) -AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include +AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall all: all-am .SUFFIXES: diff --git a/src/node.c b/src/node.c index 1262110..a51a3ec 100644 --- a/src/node.c +++ b/src/node.c @@ -169,7 +169,7 @@ void r3_tree_compile_patterns(node * n) { const char *error; int erroffset; - unsigned int option_bits; + unsigned int option_bits = 0; if (n->pcre_pattern) free(n->pcre_pattern); @@ -179,7 +179,7 @@ void r3_tree_compile_patterns(node * n) { // n->pcre_pattern; n->pcre_pattern = pcre_compile( n->combined_pattern, /* the pattern */ - 0, /* default options */ + option_bits, /* default options */ &error, /* for error message */ &erroffset, /* for error offset */ NULL); /* use default character tables */ @@ -357,17 +357,15 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route node * n = tree; edge * e = NULL; - char * p = route; - /* length of common prefix */ - int dl = 0; + int offset = 0; for( int i = 0 ; i < n->edge_len ; i++ ) { - dl = strndiff(route, n->edges[i]->pattern, n->edges[i]->pattern_len); + offset = strndiff(route, n->edges[i]->pattern, n->edges[i]->pattern_len); - // printf("dl: %d %s vs %s\n", dl, route, n->edges[i]->pattern ); + // printf("offset: %d %s vs %s\n", offset, route, n->edges[i]->pattern ); // no common, consider insert a new edge - if ( dl > 0 ) { + if ( offset > 0 ) { e = n->edges[i]; break; } @@ -377,13 +375,13 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route char *slug_s = strchr(route, '{'); char *slug_e = strchr(route, '}'); if ( slug_s && slug_e ) { - if ( dl > (slug_s - route) && dl < (slug_e - route) ) { + if ( offset > (slug_s - route) && offset < (slug_e - route) ) { // break before '{' - dl = slug_s - route; + offset = slug_s - route; } } - if ( dl == 0 ) { + if ( offset == 0 ) { // not found, we should just insert a whole new edge node * child = r3_tree_create(3); r3_tree_add_child(n, strndup(route, route_len) , child); @@ -391,10 +389,10 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route child->route_ptr = route_ptr; child->endpoint++; return child; - } else if ( dl == e->pattern_len ) { // fully-equal to the pattern of the edge + } else if ( offset == e->pattern_len ) { // fully-equal to the pattern of the edge - char * subroute = route + dl; - int subroute_len = route_len - dl; + char * subroute = route + offset; + int subroute_len = route_len - offset; // there are something more we can insert if ( subroute_len > 0 ) { @@ -406,8 +404,8 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route return e->child; } - } else if ( dl < e->pattern_len ) { - // printf("branch the edge dl: %d\n", dl); + } else if ( offset < e->pattern_len ) { + // printf("branch the edge offset: %d\n", offset); /* it's partially matched with the pattern, @@ -415,14 +413,14 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route */ node *c2; // child 1, child 2 edge *e2; // edge 1, edge 2 - char * s2 = route + dl; + char * s2 = route + offset; int s2_len = 0; - r3_edge_branch(e, dl); + r3_edge_branch(e, offset); // here is the new edge from. c2 = r3_tree_create(3); - s2_len = route_len - dl; + s2_len = route_len - offset; e2 = r3_edge_create(strndup(s2, s2_len), s2_len, c2); // printf("edge right: %s\n", e2->pattern); r3_tree_append_edge(e->child, e2); @@ -430,8 +428,8 @@ node * r3_tree_insert_pathn(node *tree, char *route, int route_len, void * route char *op = e->pattern; // truncate the original edge pattern - e->pattern = strndup(e->pattern, dl); - e->pattern_len = dl; + e->pattern = strndup(e->pattern, offset); + e->pattern_len = offset; free(op); // move n->edges to c1 From 607f209425960113910aebf7f9bce9525a860e78 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 09:16:47 +0800 Subject: [PATCH 21/30] required dot version --- README.md | 1 + src/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 46db6bc..8bba4e1 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Requirement * check * pcre * jemalloc +* graphviz version 2.38.0 (20140413.2041) Pattern Syntax ----------------------- diff --git a/src/Makefile.in b/src/Makefile.in index f9a89cf..a871788 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvc.c libr3_la_LIBADD = $(DEPS_LIBS) -AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall +AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall -std=c99 all: all-am .SUFFIXES: From b56a52e1d88eda4d3bc1c62eeb7115a127c942e4 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 09:29:31 +0800 Subject: [PATCH 22/30] Add --enable-graphviz option for graphviz: Graphviz API is changed in 2014* version. And the version on ubuntu 13.10 is 2013* Which causes build fail. --- Makefile.in | 2 + config.status | 8 ++- configure | 160 +++++++++++++++++++++++++++++++++++++++----- configure.ac | 15 ++++- include/r3.h | 2 - src/Makefile.am | 11 ++- src/Makefile.in | 14 ++-- src/gvc.c | 1 + tests/Makefile.am | 18 +++-- tests/Makefile.in | 27 +++++--- tests/bench_str.csv | 1 + tests/check_gvc.c | 1 + 12 files changed, 219 insertions(+), 41 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6c30f13..7562e83 100644 --- a/Makefile.in +++ b/Makefile.in @@ -258,6 +258,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +GVC_DEPS_CFLAGS = @GVC_DEPS_CFLAGS@ +GVC_DEPS_LIBS = @GVC_DEPS_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/config.status b/config.status index 917f241..c58a003 100755 --- a/config.status +++ b/config.status @@ -816,8 +816,12 @@ cat >>"$ac_tmp/subs1.awk" <<\_ACAWK && S["am__EXEEXT_FALSE"]="" S["am__EXEEXT_TRUE"]="#" S["LTLIBOBJS"]="" -S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck -lgvc -lcgraph -lcdt " -S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include -I/opt/local/include/graphviz " +S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck " +S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include " +S["GRAPHVIZ_FALSE"]="" +S["GRAPHVIZ_TRUE"]="#" +S["GVC_DEPS_LIBS"]="" +S["GVC_DEPS_CFLAGS"]="" S["PKG_CONFIG_LIBDIR"]="" S["PKG_CONFIG_PATH"]="" S["PKG_CONFIG"]="/opt/local/bin/pkg-config" diff --git a/configure b/configure index c09ae98..0a7cedc 100755 --- a/configure +++ b/configure @@ -633,6 +633,10 @@ am__EXEEXT_TRUE LTLIBOBJS DEPS_LIBS DEPS_CFLAGS +GRAPHVIZ_FALSE +GRAPHVIZ_TRUE +GVC_DEPS_LIBS +GVC_DEPS_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -766,6 +770,7 @@ with_gnu_ld with_sysroot enable_libtool_lock with_check +enable_graphviz ' ac_precious_vars='build_alias host_alias @@ -779,6 +784,8 @@ CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +GVC_DEPS_CFLAGS +GVC_DEPS_LIBS DEPS_CFLAGS DEPS_LIBS' @@ -1410,6 +1417,7 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) + --enable-graphviz Enable graphviz feature Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1435,6 +1443,10 @@ Some influential environment variables: directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + GVC_DEPS_CFLAGS + C compiler flags for GVC_DEPS, overriding pkg-config + GVC_DEPS_LIBS + linker flags for GVC_DEPS, overriding pkg-config DEPS_CFLAGS C compiler flags for DEPS, overriding pkg-config DEPS_LIBS linker flags for DEPS, overriding pkg-config @@ -13009,6 +13021,8 @@ done + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -13122,21 +13136,29 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi +# Check whether --enable-graphviz was given. +if test "${enable_graphviz+set}" = set; then : + enableval=$enable_graphviz; +fi + + +if test "x$enable_graphviz" = "xyes"; then : + pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5 -$as_echo_n "checking for DEPS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC_DEPS" >&5 +$as_echo_n "checking for GVC_DEPS... " >&6; } -if test -n "$DEPS_CFLAGS"; then - pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" +if test -n "$GVC_DEPS_CFLAGS"; then + pkg_cv_GVC_DEPS_CFLAGS="$GVC_DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check libgvc" 2>/dev/null` + pkg_cv_GVC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libgvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13144,16 +13166,16 @@ fi else pkg_failed=untried fi -if test -n "$DEPS_LIBS"; then - pkg_cv_DEPS_LIBS="$DEPS_LIBS" +if test -n "$GVC_DEPS_LIBS"; then + pkg_cv_GVC_DEPS_LIBS="$GVC_DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgvc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgvc") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check libgvc" 2>/dev/null` + pkg_cv_GVC_DEPS_LIBS=`$PKG_CONFIG --libs "libgvc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13174,14 +13196,118 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check libgvc" 2>&1` + GVC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgvc" 2>&1` else - DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check libgvc" 2>&1` + GVC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgvc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GVC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libgvc) were not met: + +$GVC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GVC_DEPS_CFLAGS +and GVC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GVC_DEPS_CFLAGS +and GVC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GVC_DEPS_CFLAGS=$pkg_cv_GVC_DEPS_CFLAGS + GVC_DEPS_LIBS=$pkg_cv_GVC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + +fi + if test x$enable_graphviz = xyes; then + GRAPHVIZ_TRUE= + GRAPHVIZ_FALSE='#' +else + GRAPHVIZ_TRUE='#' + GRAPHVIZ_FALSE= +fi + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5 +$as_echo_n "checking for DEPS... " >&6; } + +if test -n "$DEPS_CFLAGS"; then + pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$DEPS_LIBS"; then + pkg_cv_DEPS_LIBS="$DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check" 2>&1` + else + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpcre check libgvc) were not met: + as_fn_error $? "Package requirements (libpcre check) were not met: $DEPS_PKG_ERRORS @@ -13358,6 +13484,10 @@ if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then as_fn_error $? "conditional \"HAVE_CHECK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GRAPHVIZ_TRUE}" && test -z "${GRAPHVIZ_FALSE}"; then + as_fn_error $? "conditional \"GRAPHVIZ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/configure.ac b/configure.ac index d8a3972..24fb8e9 100644 --- a/configure.ac +++ b/configure.ac @@ -25,8 +25,21 @@ AC_FUNC_MALLOC AC_FUNC_REALLOC AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) + + PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(DEPS, [libpcre check libgvc]) +AC_ARG_ENABLE([graphviz], + AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature])) + +AS_IF([test "x$enable_graphviz" = "xyes"], [ + dnl Do the stuff needed for enabling the feature + PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) + AC_SUBST(GVC_DEPS_CFLAGS) + AC_SUBST(GVC_DEPS_LIBS) +]) +AM_CONDITIONAL(GRAPHVIZ, test x$enable_graphviz = xyes) + +PKG_CHECK_MODULES(DEPS, [libpcre check]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) AC_CONFIG_FILES([ diff --git a/include/r3.h b/include/r3.h index 0ab0a7c..b8b2690 100644 --- a/include/r3.h +++ b/include/r3.h @@ -13,7 +13,6 @@ #include #include #include -#include #include "str_array.h" @@ -134,6 +133,5 @@ match_entry * match_entry_create(char * path, int path_len); void match_entry_free(match_entry * entry); -void r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt); #endif /* !NODE_H */ diff --git a/src/Makefile.am b/src/Makefile.am index 5a9efa3..1b5d3b6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,14 @@ lib_LTLIBRARIES=libr3.la -libr3_la_SOURCES=node.c edge.c list.c str.c token.c gvc.c +libr3_la_SOURCES=node.c edge.c list.c str.c token.c + libr3_la_LIBADD=$(DEPS_LIBS) AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall + +if GRAPHVIZ + libr3_la_SOURCES += gvc.c + libr3_la_LIBADD += $(GVC_DEPS_LIBS) + AM_CFLAGS += =$(GVC_DEPS_CFLAGS) +endif + + # AM_CFLAGS=$(DEPS_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index a871788..ebe7e41 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvc.lo +am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo libr3_la_OBJECTS = $(am_libr3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -220,6 +220,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +GVC_DEPS_CFLAGS = @GVC_DEPS_CFLAGS@ +GVC_DEPS_LIBS = @GVC_DEPS_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -312,9 +314,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la -libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvc.c +libr3_la_SOURCES = node.c edge.c list.c str.c token.c libr3_la_LIBADD = $(DEPS_LIBS) -AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall -std=c99 +AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall all: all-am .SUFFIXES: @@ -395,7 +397,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@ @@ -634,6 +635,11 @@ uninstall-am: uninstall-libLTLIBRARIES mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES + +@GRAPHVIZ_TRUE@ libr3_la_SOURCES += gvc.c +@GRAPHVIZ_TRUE@ libr3_la_LIBADD += $(GVC_DEPS_LIBS) +@GRAPHVIZ_TRUE@ AM_CFLAGS += =$(GVC_DEPS_CFLAGS) + # AM_CFLAGS=$(DEPS_CFLAGS) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/gvc.c b/src/gvc.c index 5d28d8d..5a9bcca 100644 --- a/src/gvc.c +++ b/src/gvc.c @@ -9,6 +9,7 @@ #include #include #include "r3.h" +#include "r3_gvc.h" char * node_id_str(int id) { diff --git a/tests/Makefile.am b/tests/Makefile.am index 4bb69a5..b57e8b6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,16 +4,22 @@ # else # TESTS = # endif -TESTS = check_tree check_gvc -# noinst_PROGRAMS = $(TESTS) -check_PROGRAMS = $(TESTS) -check_tree_SOURCES = check_tree.c bench.c -check_tree_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ -check_tree_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ +TESTS = check_tree +if GRAPHVIZ +TESTS += check_gvc check_gvc_SOURCES = check_gvc.c bench.c check_gvc_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ check_gvc_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ +endif + + +# noinst_PROGRAMS = $(TESTS) +check_tree_SOURCES = check_tree.c bench.c +check_tree_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +check_tree_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ +check_PROGRAMS = $(TESTS) + # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include diff --git a/tests/Makefile.in b/tests/Makefile.in index 1cea0f3..f49e2c5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -77,8 +77,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -TESTS = check_tree$(EXEEXT) check_gvc$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) +TESTS = check_tree$(EXEEXT) $(am__EXEEXT_1) +@GRAPHVIZ_TRUE@am__append_1 = check_gvc +check_PROGRAMS = $(am__EXEEXT_2) subdir = tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp $(top_srcdir)/test-driver @@ -93,12 +94,14 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = check_tree$(EXEEXT) check_gvc$(EXEEXT) -am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \ - check_gvc-bench.$(OBJEXT) +@GRAPHVIZ_TRUE@am__EXEEXT_1 = check_gvc$(EXEEXT) +am__EXEEXT_2 = check_tree$(EXEEXT) $(am__EXEEXT_1) +am__check_gvc_SOURCES_DIST = check_gvc.c bench.c +@GRAPHVIZ_TRUE@am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \ +@GRAPHVIZ_TRUE@ check_gvc-bench.$(OBJEXT) check_gvc_OBJECTS = $(am_check_gvc_OBJECTS) am__DEPENDENCIES_1 = -check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1) +@GRAPHVIZ_TRUE@check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -148,7 +151,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES) -DIST_SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES) +DIST_SOURCES = $(am__check_gvc_SOURCES_DIST) $(check_tree_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -408,6 +411,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ +GVC_DEPS_CFLAGS = @GVC_DEPS_CFLAGS@ +GVC_DEPS_LIBS = @GVC_DEPS_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -499,12 +504,14 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@GRAPHVIZ_TRUE@check_gvc_SOURCES = check_gvc.c bench.c +@GRAPHVIZ_TRUE@check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +@GRAPHVIZ_TRUE@check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ + +# noinst_PROGRAMS = $(TESTS) check_tree_SOURCES = check_tree.c bench.c check_tree_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ check_tree_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ -check_gvc_SOURCES = check_gvc.c bench.c -check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ -check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include diff --git a/tests/bench_str.csv b/tests/bench_str.csv index 3e57663..9ec2549 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -87,3 +87,4 @@ 1400372910,12755936.07 1400373185,13716181.30 1400374415,13164892.40 +1400376564,11239373.08 diff --git a/tests/check_gvc.c b/tests/check_gvc.c index 4c41f74..e3c9cb2 100644 --- a/tests/check_gvc.c +++ b/tests/check_gvc.c @@ -10,6 +10,7 @@ #include #include "r3.h" #include "r3_str.h" +#include "r3_gvc.h" #include "str_array.h" #include "bench.h" From cdbfb2f05bbaa992a03bbd511867b7f158e80fcb Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 09:31:08 +0800 Subject: [PATCH 23/30] update README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8bba4e1..d9cc2d5 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,8 @@ Install make check # run tests sudo make install - +### Enable Graphviz + + ./configure --enable-graphviz From 6c651cb1ef9d553006c2ce9b4c60d1fb810fc3c7 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 09:32:14 +0800 Subject: [PATCH 24/30] Add lib_LIBRARIES option to Makefile.am --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1b5d3b6..a7fb90b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,6 @@ -lib_LTLIBRARIES=libr3.la -libr3_la_SOURCES=node.c edge.c list.c str.c token.c +lib_LTLIBRARIES = libr3.la +lib_LIBRARIES = libr3.a +libr3_la_SOURCES = node.c edge.c list.c str.c token.c libr3_la_LIBADD=$(DEPS_LIBS) AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall @@ -10,5 +11,4 @@ if GRAPHVIZ AM_CFLAGS += =$(GVC_DEPS_CFLAGS) endif - # AM_CFLAGS=$(DEPS_CFLAGS) From 2e7a3c2736201064589ce6df4b3b81d269e1f064 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 10:13:51 +0800 Subject: [PATCH 25/30] workable --enable-graphviz --- config.status | 14 ++++---- configure | 81 ++++++++++++++++++++++++++++++++++++++++------- configure.ac | 57 +++++++++++++++++++++++++++------ src/Makefile.am | 10 +++--- src/Makefile.in | 26 +++++++++------ tests/Makefile.am | 2 +- tests/Makefile.in | 17 +++++----- 7 files changed, 156 insertions(+), 51 deletions(-) diff --git a/config.status b/config.status index c58a003..d91d60f 100755 --- a/config.status +++ b/config.status @@ -427,7 +427,7 @@ $config_commands Report bugs to the package provider." -ac_cs_config="" +ac_cs_config="'--enable-graphviz'" ac_cs_version="\ r3 config.status 1.0 configured by ./configure, generated by GNU Autoconf 2.69, @@ -519,7 +519,7 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X /bin/sh './configure' $ac_configure_extra_args --no-create --no-recursion + set X /bin/sh './configure' '--enable-graphviz' $ac_configure_extra_args --no-create --no-recursion shift $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 CONFIG_SHELL='/bin/sh' @@ -818,10 +818,12 @@ S["am__EXEEXT_TRUE"]="#" S["LTLIBOBJS"]="" S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck " S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include " -S["GRAPHVIZ_FALSE"]="" -S["GRAPHVIZ_TRUE"]="#" -S["GVC_DEPS_LIBS"]="" -S["GVC_DEPS_CFLAGS"]="" +S["DEBUG_FALSE"]="" +S["DEBUG_TRUE"]="#" +S["ENABLE_GRAPHVIZ_FALSE"]="#" +S["ENABLE_GRAPHVIZ_TRUE"]="" +S["GVC_DEPS_LIBS"]="-L/opt/local/lib -lgvc -lcgraph -lcdt " +S["GVC_DEPS_CFLAGS"]="-I/opt/local/include/graphviz " S["PKG_CONFIG_LIBDIR"]="" S["PKG_CONFIG_PATH"]="" S["PKG_CONFIG"]="/opt/local/bin/pkg-config" diff --git a/configure b/configure index 0a7cedc..e790ebe 100755 --- a/configure +++ b/configure @@ -633,8 +633,10 @@ am__EXEEXT_TRUE LTLIBOBJS DEPS_LIBS DEPS_CFLAGS -GRAPHVIZ_FALSE -GRAPHVIZ_TRUE +DEBUG_FALSE +DEBUG_TRUE +ENABLE_GRAPHVIZ_FALSE +ENABLE_GRAPHVIZ_TRUE GVC_DEPS_LIBS GVC_DEPS_CFLAGS PKG_CONFIG_LIBDIR @@ -771,6 +773,7 @@ with_sysroot enable_libtool_lock with_check enable_graphviz +enable_debug ' ac_precious_vars='build_alias host_alias @@ -1417,7 +1420,8 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) - --enable-graphviz Enable graphviz feature + --enable-graphviz enable graphviz support + --enable-debug Turn on debugging Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -13136,15 +13140,25 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi + +# AC_ARG_ENABLE([graphviz], +# AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature])) + + # Check whether --enable-graphviz was given. if test "${enable_graphviz+set}" = set; then : enableval=$enable_graphviz; +else + enable_graphviz=unset fi -if test "x$enable_graphviz" = "xyes"; then : + + +if test "x$enable_graphviz" != "xunset" ; then + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC_DEPS" >&5 $as_echo_n "checking for GVC_DEPS... " >&6; } @@ -13237,18 +13251,57 @@ $as_echo "yes" >&6; } fi +fi -fi - if test x$enable_graphviz = xyes; then - GRAPHVIZ_TRUE= - GRAPHVIZ_FALSE='#' + if test "x$enable_graphviz" = "xyes"; then + ENABLE_GRAPHVIZ_TRUE= + ENABLE_GRAPHVIZ_FALSE='#' else - GRAPHVIZ_TRUE='#' - GRAPHVIZ_FALSE= + ENABLE_GRAPHVIZ_TRUE='#' + ENABLE_GRAPHVIZ_FALSE= fi +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; case "${enableval}" in + yes) enable_debug=true ;; + no) enable_debug=false ;; + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; +esac +else + enable_debug=false +fi + + if test x$enable_debug = xtrue; then + DEBUG_TRUE= + DEBUG_FALSE='#' +else + DEBUG_TRUE='#' + DEBUG_FALSE= +fi + + + +# fi],[ +# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.]) +# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0) +# AC_ARG_ENABLE(graphviz, +# [ --enable-graphvizviz Build with graphviz support], +# [if test x$enableval != xyes; then +# AC_DEFINE(ENABLE_GRAPHVIZ, 1, [Graphviz support enabled.]) +# PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) +# AC_SUBST(GVC_DEPS_CFLAGS) +# AC_SUBST(GVC_DEPS_LIBS) +# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 1) +# fi],[ +# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.]) +# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0) +# ]) + + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5 $as_echo_n "checking for DEPS... " >&6; } @@ -13484,8 +13537,12 @@ if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then as_fn_error $? "conditional \"HAVE_CHECK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${GRAPHVIZ_TRUE}" && test -z "${GRAPHVIZ_FALSE}"; then - as_fn_error $? "conditional \"GRAPHVIZ\" was never defined. +if test -z "${ENABLE_GRAPHVIZ_TRUE}" && test -z "${ENABLE_GRAPHVIZ_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_GRAPHVIZ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then + as_fn_error $? "conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 24fb8e9..427c2c6 100644 --- a/configure.ac +++ b/configure.ac @@ -28,16 +28,55 @@ AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) PKG_PROG_PKG_CONFIG -AC_ARG_ENABLE([graphviz], - AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature])) -AS_IF([test "x$enable_graphviz" = "xyes"], [ - dnl Do the stuff needed for enabling the feature - PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) - AC_SUBST(GVC_DEPS_CFLAGS) - AC_SUBST(GVC_DEPS_LIBS) -]) -AM_CONDITIONAL(GRAPHVIZ, test x$enable_graphviz = xyes) +# AC_ARG_ENABLE([graphviz], +# AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature])) + + +AC_ARG_ENABLE(graphviz, + AS_HELP_STRING([--enable-graphviz], + [enable graphviz support]), + , enable_graphviz=unset) + + + + + +if test "x$enable_graphviz" != "xunset" ; then + PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) + AC_SUBST(GVC_DEPS_CFLAGS) + AC_SUBST(GVC_DEPS_LIBS) +fi + +AM_CONDITIONAL(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes") + + +AC_ARG_ENABLE([debug], +[ --enable-debug Turn on debugging], +[case "${enableval}" in + yes) enable_debug=true ;; + no) enable_debug=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; +esac],[enable_debug=false]) +AM_CONDITIONAL([DEBUG], [test x$enable_debug = xtrue]) + + +# fi],[ +# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.]) +# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0) +# AC_ARG_ENABLE(graphviz, +# [ --enable-graphvizviz Build with graphviz support], +# [if test x$enableval != xyes; then +# AC_DEFINE(ENABLE_GRAPHVIZ, 1, [Graphviz support enabled.]) +# PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) +# AC_SUBST(GVC_DEPS_CFLAGS) +# AC_SUBST(GVC_DEPS_LIBS) +# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 1) +# fi],[ +# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.]) +# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0) +# ]) + PKG_CHECK_MODULES(DEPS, [libpcre check]) AC_SUBST(DEPS_CFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index a7fb90b..8decc22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,14 +1,14 @@ lib_LTLIBRARIES = libr3.la -lib_LIBRARIES = libr3.a +# lib_LIBRARIES = libr3.a libr3_la_SOURCES = node.c edge.c list.c str.c token.c libr3_la_LIBADD=$(DEPS_LIBS) AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall -if GRAPHVIZ - libr3_la_SOURCES += gvc.c - libr3_la_LIBADD += $(GVC_DEPS_LIBS) - AM_CFLAGS += =$(GVC_DEPS_CFLAGS) +if ENABLE_GRAPHVIZ +libr3_la_SOURCES += gvc.c +libr3_la_LIBADD += $(GVC_DEPS_LIBS) +AM_CFLAGS += $(GVC_DEPS_CFLAGS) endif # AM_CFLAGS=$(DEPS_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index ebe7e41..dead82c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -78,6 +78,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_GRAPHVIZ_TRUE@am__append_1 = gvc.c +@ENABLE_GRAPHVIZ_TRUE@am__append_2 = $(GVC_DEPS_LIBS) +@ENABLE_GRAPHVIZ_TRUE@am__append_3 = $(GVC_DEPS_CFLAGS) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -122,8 +125,12 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo +@ENABLE_GRAPHVIZ_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am__libr3_la_SOURCES_DIST = node.c edge.c list.c str.c token.c gvc.c +@ENABLE_GRAPHVIZ_TRUE@am__objects_1 = gvc.lo +am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo \ + $(am__objects_1) libr3_la_OBJECTS = $(am_libr3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -164,7 +171,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libr3_la_SOURCES) -DIST_SOURCES = $(libr3_la_SOURCES) +DIST_SOURCES = $(am__libr3_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -314,9 +321,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libr3.la -libr3_la_SOURCES = node.c edge.c list.c str.c token.c -libr3_la_LIBADD = $(DEPS_LIBS) -AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall +# lib_LIBRARIES = libr3.a +libr3_la_SOURCES = node.c edge.c list.c str.c token.c $(am__append_1) +libr3_la_LIBADD = $(DEPS_LIBS) $(am__append_2) +AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include \ + -Wall $(am__append_3) all: all-am .SUFFIXES: @@ -397,6 +406,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@ @@ -636,10 +646,6 @@ uninstall-am: uninstall-libLTLIBRARIES tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES -@GRAPHVIZ_TRUE@ libr3_la_SOURCES += gvc.c -@GRAPHVIZ_TRUE@ libr3_la_LIBADD += $(GVC_DEPS_LIBS) -@GRAPHVIZ_TRUE@ AM_CFLAGS += =$(GVC_DEPS_CFLAGS) - # AM_CFLAGS=$(DEPS_CFLAGS) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/Makefile.am b/tests/Makefile.am index b57e8b6..ec7fb86 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,7 @@ # endif TESTS = check_tree -if GRAPHVIZ +if ENABLE_GRAPHVIZ TESTS += check_gvc check_gvc_SOURCES = check_gvc.c bench.c check_gvc_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ diff --git a/tests/Makefile.in b/tests/Makefile.in index f49e2c5..014629a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -78,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ TESTS = check_tree$(EXEEXT) $(am__EXEEXT_1) -@GRAPHVIZ_TRUE@am__append_1 = check_gvc +@ENABLE_GRAPHVIZ_TRUE@am__append_1 = check_gvc check_PROGRAMS = $(am__EXEEXT_2) subdir = tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -94,14 +94,15 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@GRAPHVIZ_TRUE@am__EXEEXT_1 = check_gvc$(EXEEXT) +@ENABLE_GRAPHVIZ_TRUE@am__EXEEXT_1 = check_gvc$(EXEEXT) am__EXEEXT_2 = check_tree$(EXEEXT) $(am__EXEEXT_1) am__check_gvc_SOURCES_DIST = check_gvc.c bench.c -@GRAPHVIZ_TRUE@am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \ -@GRAPHVIZ_TRUE@ check_gvc-bench.$(OBJEXT) +@ENABLE_GRAPHVIZ_TRUE@am_check_gvc_OBJECTS = \ +@ENABLE_GRAPHVIZ_TRUE@ check_gvc-check_gvc.$(OBJEXT) \ +@ENABLE_GRAPHVIZ_TRUE@ check_gvc-bench.$(OBJEXT) check_gvc_OBJECTS = $(am_check_gvc_OBJECTS) am__DEPENDENCIES_1 = -@GRAPHVIZ_TRUE@check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1) +@ENABLE_GRAPHVIZ_TRUE@check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -504,9 +505,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@GRAPHVIZ_TRUE@check_gvc_SOURCES = check_gvc.c bench.c -@GRAPHVIZ_TRUE@check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ -@GRAPHVIZ_TRUE@check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ +@ENABLE_GRAPHVIZ_TRUE@check_gvc_SOURCES = check_gvc.c bench.c +@ENABLE_GRAPHVIZ_TRUE@check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@ +@ENABLE_GRAPHVIZ_TRUE@check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@ # noinst_PROGRAMS = $(TESTS) check_tree_SOURCES = check_tree.c bench.c From 1cae209d9f246a88d7d1420a62f637d11bd4ee09 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 10:14:08 +0800 Subject: [PATCH 26/30] update version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 427c2c6..ebe67ae 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([r3], 1.0) +AC_INIT([r3], 1.0.0) AC_PREREQ([2.64]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) From d3218b6331c880ad188007d56716d2e44f8b1361 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 10:22:53 +0800 Subject: [PATCH 27/30] clean up configure.ac --- configure.ac | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/configure.ac b/configure.ac index ebe67ae..b361f96 100644 --- a/configure.ac +++ b/configure.ac @@ -29,19 +29,10 @@ AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr]) PKG_PROG_PKG_CONFIG -# AC_ARG_ENABLE([graphviz], -# AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature])) - - AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--enable-graphviz], [enable graphviz support]), , enable_graphviz=unset) - - - - - if test "x$enable_graphviz" != "xunset" ; then PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) AC_SUBST(GVC_DEPS_CFLAGS) @@ -51,33 +42,6 @@ fi AM_CONDITIONAL(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes") -AC_ARG_ENABLE([debug], -[ --enable-debug Turn on debugging], -[case "${enableval}" in - yes) enable_debug=true ;; - no) enable_debug=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; -esac],[enable_debug=false]) -AM_CONDITIONAL([DEBUG], [test x$enable_debug = xtrue]) - - -# fi],[ -# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.]) -# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0) -# AC_ARG_ENABLE(graphviz, -# [ --enable-graphvizviz Build with graphviz support], -# [if test x$enableval != xyes; then -# AC_DEFINE(ENABLE_GRAPHVIZ, 1, [Graphviz support enabled.]) -# PKG_CHECK_MODULES(GVC_DEPS, [libgvc]) -# AC_SUBST(GVC_DEPS_CFLAGS) -# AC_SUBST(GVC_DEPS_LIBS) -# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 1) -# fi],[ -# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.]) -# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0) -# ]) - - PKG_CHECK_MODULES(DEPS, [libpcre check]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) From 2e6aca1dadf7a4c535bd8ae6e7f448c2c491c4b0 Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 10:27:53 +0800 Subject: [PATCH 28/30] update LICENSE --- COPYING | 695 ++------------------------------------------------------ LICENSE | 21 ++ 2 files changed, 42 insertions(+), 674 deletions(-) create mode 100644 LICENSE diff --git a/COPYING b/COPYING index 94a9ed0..448c6c6 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +The MIT License (MIT) + +Copyright (c) 2014 yoanlin93@gmail.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..448c6c6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 yoanlin93@gmail.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From f9ce80ebf3b1d298dd20f0a6e1a558bf3e27213d Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 10:28:19 +0800 Subject: [PATCH 29/30] Add license to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index d9cc2d5..2ace6bc 100644 --- a/README.md +++ b/README.md @@ -145,3 +145,7 @@ Install ./configure --enable-graphviz + +License +-------------------- +This software is released under MIT License. From 1f1faff8b07a3d4e17f1c257caf8a9f5cc91ad6e Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 10:29:36 +0800 Subject: [PATCH 30/30] Add include header to synopsis --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2ace6bc..92c74d2 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,8 @@ C API ------------------------ ```c +#include + // create a router tree with 10 children capacity (this capacity can grow dynamically) n = r3_tree_create(10);