CVS v1.1 source

Author: bediger4000

abbreviations.c

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -20,7 +20,7 @@
 */
 
 
-/* $Id: abbreviations.c,v 1.6 2010/08/10 20:50:39 bediger Exp $ */
+/* $Id: abbreviations.c,v 1.8 2011/06/12 18:22:00 bediger Exp $ */
 
 /*
  * Abbreviations: an identifier can reference an entire parse tree
@@ -60,7 +60,11 @@ abbreviation_lookup(const char *id)
 	/* make an arena-allocated copy of the abbreviation, so that
 	 * reduce_graph() can destructively reduce the resulting
 	 * parse tree. */
-	if (p) r = arena_copy_graph((struct node *)p);
+	if (p)
+	{
+		preallocate_nodes(((struct node *)p)->tree_size);
+		r = arena_copy_graph((struct node *)p);
+	}
 	return r;
 }
 
@@ -112,10 +116,12 @@ copy_graph(struct node *p)
 	case APPLICATION:
 		r->left = copy_graph(p->left);
 		r->right = copy_graph(p->right);
+		r->tree_size = r->left->tree_size + r->right->tree_size + 1;
 		break;
 	case ATOM:
 		r->rule = p->rule;
 		r->left = r->right = NULL;
+		r->tree_size = 1;
 		break;
 	}
 	return r;

abbreviations.h

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* $Id: abbreviations.h,v 1.3 2010/04/02 03:43:39 bediger Exp $ */
+/* $Id: abbreviations.h,v 1.4 2011/06/12 18:19:11 bediger Exp $ */
 
 void setup_abbreviation_table(struct hashtable *h);
 

aho_corasick.c

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* $Id: aho_corasick.c,v 1.3 2010/08/10 20:50:39 bediger Exp $ */
+/* $Id: aho_corasick.c,v 1.8 2011/06/12 18:22:00 bediger Exp $ */
 
 /*
  *  This code based on:
@@ -56,6 +56,7 @@ struct stack_elem {
 	struct node *n; /* 1 */
 	int state_at_n; /* 2 */
 	int visited;    /* 3 */
+	int node_number;
 };
 
 void set_output_length(struct gto *p, int state, int node_count);
@@ -258,7 +259,6 @@ construct_failure(struct gto *g)
 	int i;
 	struct queue *q;
 
-
 	g->failure = malloc(g->ary_len * sizeof(int));
 
 	for (i = 0; i < g->ary_len; ++i)
@@ -394,6 +394,7 @@ algorithm_d(struct gto *g, struct node *t, int subject_node_count, int pat_path_
 {
 	int top = 1;
 	int matched = 0;
+	int breadth_counter = 0;
 	int next_state;
 	int i;
 	int *count;
@@ -415,23 +416,34 @@ algorithm_d(struct gto *g, struct node *t, int subject_node_count, int pat_path_
 	stack[top].n = t;
 	stack[top].state_at_n = next_state;
 	stack[top].visited = 0;
+	stack[top].node_number = breadth_counter++;
 
 	matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
 
 	if (!matched)
 	{
-		if (var_in_tree(t, abstr_var_name))
-			next_state = g->delta[0][(int)'+'];
-		else
-			next_state = g->delta[0][(int)'-'];
-
-		matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
+		if (any_var_in_tree(t))
+		{
+		  	if (var_in_tree(t, abstr_var_name))
+				next_state = g->delta[0][(int)'+'];
+			else
+				next_state = g->delta[0][(int)'-'];
+			matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
+		} else {
+			next_state = g->delta[0][(int)'!'];
+			matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
+			if (!matched)
+			{
+				next_state = g->delta[0][(int)'-'];
+				matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
+			}
+		}
 	}
 
 	while (!matched && top > 0)
 	{
 		struct node *next_node, *this_node = stack[top].n;
-		int intstate, next_state, this_state = stack[top].state_at_n;
+		int intstate, nxt_st, this_state = stack[top].state_at_n;
 		int visited = stack[top].visited;
 
 		if (visited == 2 || this_node->typ == ATOM || top > g->max_node_count)
@@ -444,27 +456,35 @@ algorithm_d(struct gto *g, struct node *t, int subject_node_count, int pat_path_
 			matched += tabulate(g, stack, top, intstate, pat_path_cnt, count);
 
 			next_node = (visited == 1)? this_node->left: this_node->right;
-			next_state = intstate;
+			nxt_st = intstate;
 
 			p = (next_node->name != abstr_var_name)? next_node->name: abstr_meta_var;
 			while (*p)
-				next_state = g->delta[next_state][(int)*p++];
+				nxt_st = g->delta[nxt_st][(int)*p++];
 
 			++top;
 			stack[top].n = next_node;
-			stack[top].state_at_n = next_state;
+			stack[top].state_at_n = nxt_st;
 			stack[top].visited = 0;
+			stack[top].node_number = breadth_counter++;
 
 			if (top <= g->max_node_count)
 			{
-				matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
-
-				if (var_in_tree(next_node, abstr_var_name))
-					next_state = g->delta[intstate][(int)'+'];
-				else
-					next_state = g->delta[intstate][(int)'-'];
-
-				matched += tabulate(g, stack, top, next_state, pat_path_cnt, count);
+				matched += tabulate(g, stack, top, nxt_st, pat_path_cnt, count);
+
+				if (any_var_in_tree(next_node))
+				{
+					if (var_in_tree(next_node, abstr_var_name))
+						nxt_st = g->delta[intstate][(int)'+'];
+					else
+						nxt_st = g->delta[intstate][(int)'-'];
+				} else {
+					nxt_st = g->delta[intstate][(int)'!'];
+					if (0 == nxt_st)
+						nxt_st = g->delta[intstate][(int)'-'];
+				}
+
+				matched += tabulate(g, stack, top, nxt_st, pat_path_cnt, count);
 			}
 		}
 	}
@@ -494,11 +514,11 @@ tabulate(struct gto *g, struct stack_elem *stack, int top, int state, int pat_le
 
 	for (i = 0; r == 0 && i < oxt->len; ++i)
 	{
-		struct node *n = stack[top - oxt->out[i] + 1].n;
+		int idx = top - oxt->out[i] + 1;
 
-		++count[n->node_number];
+		++count[stack[idx].node_number];
 
-		if (count[n->node_number] == pat_leaf_count)
+		if (count[stack[idx].node_number] == pat_leaf_count)
 			r = 1;
 	}
 

aho_corasick.h

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* $Id: aho_corasick.h,v 1.2 2010/07/19 17:55:40 bediger Exp $ */
+/* $Id: aho_corasick.h,v 1.3 2011/06/12 18:19:11 bediger Exp $ */
 
 struct output_extent {
 	int   *out;   /* array of int, lengths of matched paths */

arena.c

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -18,12 +18,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* $Id: arena.c,v 1.2 2010/04/02 03:43:39 bediger Exp $ */
+/* $Id: arena.c,v 1.6 2011/06/12 18:22:00 bediger Exp $ */
 
 #include <stdio.h>
 #include <unistd.h>  /* getpagesize() */
 #include <stdlib.h>  /* malloc(), free() */
-#include <assert.h>  /* malloc(), free() */
 
 #include <arena.h>
 
@@ -50,7 +49,6 @@ struct memory_arena {
 	int sz;                     /* max free size */
 	int remaining;              /* how many bytes remain in allocation */
 	struct memory_arena *next;
-	int usage_info;
 	int sn;                     /* serial number: malloc order */
 };
 
@@ -65,31 +63,29 @@ static int combosize = 0;
  * the malloc() of one or more pages, and a 2nd element in the stack.
  */
 struct memory_arena *
-new_arena(int memory_info_flag)
+new_arena(void)
 {
 	struct memory_arena *ra = NULL;
 
-	if (!pagesize)
-	{
-		combosize = sizeof(union combo);
-		pagesize = getpagesize();
-		headersize = roundup(sizeof(struct memory_arena), combosize);
-	}
+	/* This is not so costly that it can't happen
+	 * on every call to new_arena(). */
+	combosize = sizeof(union combo);
+	pagesize = getpagesize();
+	headersize = roundup(sizeof(struct memory_arena), combosize);
 
 	ra = malloc(sizeof(*ra));
 
 	ra->sz = 0;
 	ra->remaining = 0;
 	ra->first_allocation = ra->next_allocation = NULL;
 	ra->next = NULL;
-	ra->usage_info = memory_info_flag;
 	ra->sn = 0;
 
 	return ra;
 }
 
 void
-deallocate_arena(struct memory_arena *ma, int memory_info_flag)
+deallocate_arena(struct memory_arena *ma)
 {
 	int free_arena_cnt = 0;
 	int maxsz = 0;
@@ -105,52 +101,18 @@ deallocate_arena(struct memory_arena *ma, int memory_info_flag)
 		ma = tmp;
 		++free_arena_cnt;
 	}
-
-	if (memory_info_flag)
-	{
-		fprintf(stderr, "Page size %d (0x%x)\n", pagesize, pagesize);
-		fprintf(stderr, "Header size %d (0x%x)\n", headersize, headersize);
-		fprintf(stderr, "Allocated %d arenas\n", free_arena_cnt);
-		fprintf(stderr, "Max arena size %d (0x%x)\n", maxsz, maxsz);
-	}
 }
 
 void
 free_arena_contents(struct memory_arena *ma)
 {
-	int last_sn = ma->sn;
-	int max_sn = ma->sn;
 	int arena_count = 0;
 
 	ma = ma->next; /* dummy head node */
 	while (ma)
 	{
 		++arena_count;
 
-		if (ma->sn >= last_sn + 1)
-		{
-			fprintf(stderr, "Loop in chain of allocations: S/N %d, next S/N %d\n",
-				last_sn, ma->sn);
-			fprintf(stderr, "Allocated %d arenas\n", max_sn);
-			break;
-		} else
-			last_sn = ma->sn;
-
-		if (ma->sn > max_sn)
-		{
-			fprintf(stderr, "Chain of allocations out of order: max S/N %d, S/N %d\n",
-				max_sn, ma->sn);
-			fprintf(stderr, "Allocated %d arenas\n", max_sn);
-			break;
-		}
-
-		if (arena_count > max_sn)
-		{
-			fprintf(stderr, "Found at least %d allocations on chain, should only have %d\n",
-				arena_count, max_sn);
-			break;
-		}
-
 		ma->remaining = ma->sz;
 		ma->next_allocation = ma->first_allocation;
 		ma = ma->next;
@@ -164,8 +126,6 @@ arena_alloc(struct memory_arena *ma, size_t size)
 	struct memory_arena *ca;
 	size_t nsize;
 
-	assert(NULL != ma);
-
 	/* What you actually have to allocate to get to
 	 * a block "suitably aligned" for any use. */
 	nsize = roundup(size, combosize);

arena.h

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -18,11 +18,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* $Id: arena.h,v 1.2 2010/04/02 03:43:39 bediger Exp $ */
+/* $Id: arena.h,v 1.5 2011/06/12 18:19:11 bediger Exp $ */
 
-struct memory_arena *new_arena(int memory_info_flag);
+struct memory_arena *new_arena(void);
 void free_arena_contents(struct memory_arena *ma);
-void deallocate_arena(struct memory_arena *ma, int memory_info_flag);
+void deallocate_arena(struct memory_arena *ma);
 
 void *arena_alloc(struct memory_arena *ma, size_t size);
 

atom.c

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2010, Bruce Ediger
+	Copyright (C) 2010-2011, Bruce Ediger
 
     This file is part of acl.
 
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* $Id: atom.c,v 1.4 2010/08/10 20:50:39 bediger Exp $ */
+/* $Id: atom.c,v 1.5 2011/06/12 18:22:00 bediger Exp $ */
 
 /*
  * A stripped-down "atom" datatype, a la "C Interfaces and Implementation".