Merge pull request katef#472 from katef/sv/add_fsm_vacuum

Add fsm_vacuum, which reduces the state array when over-allocated.

include/fsm/fsm.h

@@ -15,6 +15,8 @@
  * be atomic.
  */
 
+#include <stdbool.h>
+
 struct fsm;
 struct fsm_options;
 struct path; /* XXX */
@@ -493,5 +495,11 @@ int fsm_fgetc(void *opaque); /* expects opaque to be FILE *  */
 int
 fsm_shuffle(struct fsm *fsm, unsigned seed);
 
+/* Attempt to reclaim memory if an FSM has significantly reduced its
+ * state count. Returns true if the vacuuming attempt succeeded (including
+ * deciding not to do anything), false if realloc failed. */
+bool
+fsm_vacuum(struct fsm *fsm);
+
 #endif
 

src/libfsm/Makefile

@@ -22,6 +22,7 @@ SRC += src/libfsm/trim.c
 SRC += src/libfsm/example.c
 SRC += src/libfsm/getc.c
 SRC += src/libfsm/shuffle.c
+SRC += src/libfsm/vacuum.c
 SRC += src/libfsm/vm.c
 
 # graph things

src/libfsm/fsm.c

@@ -22,6 +22,9 @@
 #include "capture.h"
 #include "endids.h"
 
+/* guess for default state allocation */
+#define FSM_DEFAULT_STATEALLOC 128
+
 void
 free_contents(struct fsm *fsm)
 {
@@ -57,7 +60,7 @@ fsm_new(const struct fsm_options *opt)
 		return NULL;
 	}
 
-	new->statealloc = 128; /* guess */
+	new->statealloc = FSM_DEFAULT_STATEALLOC;
 	new->statecount = 0;
 	new->endcount   = 0;
 	new->capture_info = NULL;

src/libfsm/libfsm.syms

@@ -68,6 +68,7 @@ fsm_addstate
 fsm_addstate_bulk
 fsm_removestate
 fsm_shuffle
+fsm_vacuum
 
 fsm_addedge_any
 fsm_addedge_epsilon

src/libfsm/minimise.c

@@ -157,6 +157,12 @@ fsm_minimise(struct fsm *fsm)
 
 	fsm_move(fsm, dst);
 
+	/* The FSM state count should be settled now, so if the state
+	 * allocation is unnecessarily large move to a smaller one. */
+	if (!fsm_vacuum(fsm)) {	/* realloc failure */
+		r = 0;
+	}
+
 cleanup:
 	if (mapping != NULL) {
 		f_free(fsm->opt->alloc, mapping);

src/libfsm/vacuum.c

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 Scott Vokes
+ *
+ * See LICENCE for the full copyright terms.
+ */
+
+#include <stdlib.h>
+#include <fsm/fsm.h>
+#include <fsm/alloc.h>
+
+#include <assert.h>
+
+#include "internal.h"
+
+bool
+fsm_vacuum(struct fsm *fsm)
+{
+	assert(fsm != NULL);
+	assert(fsm->statecount <= fsm->statealloc);
+	size_t nceil = fsm->statealloc;
+
+	while ((fsm->statecount < nceil/2) && nceil > 1) {
+		nceil /= 2;
+	}
+
+	if (nceil == fsm->statealloc) {
+		return true;
+	}
+
+	struct fsm_state *nstates = f_realloc(fsm->opt->alloc,
+	    fsm->states, nceil * sizeof(nstates[0]));
+	if (nstates == NULL) {
+		return false;
+	}
+
+	fsm->states = nstates;
+	fsm->statealloc = nceil;
+
+	return true;
+}