altos/lisp: Optimize chunk searching in collect

[fw/altos] / src / test / ao_lisp_test.c

diff --git a/src/test/ao_lisp_test.c b/src/test/ao_lisp_test.c
index e303869f411fb05e819f489096538e8b4b89b65e..68e3a2027d6f3ee1a51250d588b31b70c3fdaea4 100644 (file)
--- a/src/test/ao_lisp_test.c
+++ b/src/test/ao_lisp_test.c
@@ -15,50 +15,120 @@
 #include "ao_lisp.h"
 #include <stdio.h>
 
-static struct ao_lisp_cons     *list;
-static char                    *string;
+static FILE *ao_lisp_file;
+static int newline = 1;
+
+static char save_file[] = "lisp.image";
 
 int
-main (int argc, char **argv)
+ao_lisp_os_save(void)
 {
-       int                     i, j;
-       struct ao_lisp_atom     *atom;
-
-       ao_lisp_root_add(&ao_lisp_cons_type, (void **) &list);
-       ao_lisp_root_add(&ao_lisp_string_type, (void **) &string);
-
-       /* allocator test */
-       for (j = 0; j < 10; j++) {
-               list = 0;
-               string = ao_lisp_string_new(0);
-               for (i = 0; i < 2; i++) {
-                       string = ao_lisp_string_cat(string, "a");
-                       list = ao_lisp_cons_cons(ao_lisp_string_poly(string), list);
-                       list = ao_lisp_cons_cons(ao_lisp_int_poly(i), list);
-                       atom = ao_lisp_atom_intern("ant");
-                       list = ao_lisp_cons_cons(ao_lisp_atom_poly(atom), list);
-               }
-               ao_lisp_poly_print(ao_lisp_cons_poly(list));
-               printf("\n");
+       FILE    *save = fopen(save_file, "w");
+
+       if (!save) {
+               perror(save_file);
+               return 0;
        }
+       fwrite(ao_lisp_pool, 1, AO_LISP_POOL_TOTAL, save);
+       fclose(save);
+       return 1;
+}
 
-       for (atom = ao_lisp_poly_atom(ao_builtin_atoms); atom; atom = ao_lisp_poly_atom(atom->next)) {
-               printf("%s = ", atom->name);
-               ao_lisp_poly_print(ao_lisp_atom_get(ao_lisp_atom_poly(atom)));
-               printf("\n");
+int
+ao_lisp_os_restore_save(struct ao_lisp_os_save *save, int offset)
+{
+       FILE    *restore = fopen(save_file, "r");
+       size_t  ret;
+
+       if (!restore) {
+               perror(save_file);
+               return 0;
        }
-#if 1
-       list = ao_lisp_cons_cons(ao_lisp_atom_poly(ao_lisp_atom_intern("+")),
-                                ao_lisp_cons_cons(ao_lisp_cons_poly(ao_lisp_cons_cons(ao_lisp_atom_poly(ao_lisp_atom_intern("+")),
-                                                                                      ao_lisp_cons_cons(ao_lisp_int_poly(3),
-                                                                                                        ao_lisp_cons_cons(ao_lisp_int_poly(4), NULL)))),
-                                                  ao_lisp_cons_cons(ao_lisp_int_poly(2), NULL)));
-       printf("list: ");
-       ao_lisp_poly_print(ao_lisp_cons_poly(list));
-       printf ("\n");
-       ao_lisp_poly_print(ao_lisp_eval(ao_lisp_cons_poly(list)));
-       printf ("\n");
+       fseek(restore, offset, SEEK_SET);
+       ret = fread(save, sizeof (struct ao_lisp_os_save), 1, restore);
+       fclose(restore);
+       if (ret != 1)
+               return 0;
+       return 1;
+}
 
+int
+ao_lisp_os_restore(void)
+{
+       FILE    *restore = fopen(save_file, "r");
+       size_t  ret;
+
+       if (!restore) {
+               perror(save_file);
+               return 0;
+       }
+       ret = fread(ao_lisp_pool, 1, AO_LISP_POOL_TOTAL, restore);
+       fclose(restore);
+       if (ret != AO_LISP_POOL_TOTAL)
+               return 0;
+       return 1;
+}
+
+int
+ao_lisp_getc(void)
+{
+       int c;
+
+       if (ao_lisp_file)
+               return getc(ao_lisp_file);
+
+       if (newline) {
+               printf("> ");
+               newline = 0;
+       }
+       c = getchar();
+       if (c == '\n')
+               newline = 1;
+       return c;
+}
+
+int
+main (int argc, char **argv)
+{
+       while (*++argv) {
+               ao_lisp_file = fopen(*argv, "r");
+               if (!ao_lisp_file) {
+                       perror(*argv);
+                       exit(1);
+               }
+               ao_lisp_read_eval_print();
+               fclose(ao_lisp_file);
+               ao_lisp_file = NULL;
+       }
        ao_lisp_read_eval_print();
-#endif
+
+       printf ("collects: full: %d incremental %d\n",
+               ao_lisp_collects[AO_LISP_COLLECT_FULL],
+               ao_lisp_collects[AO_LISP_COLLECT_INCREMENTAL]);
+
+       printf ("freed: full %d incremental %d\n",
+               ao_lisp_freed[AO_LISP_COLLECT_FULL],
+               ao_lisp_freed[AO_LISP_COLLECT_INCREMENTAL]);
+
+       printf("loops: full %d incremental %d\n",
+               ao_lisp_loops[AO_LISP_COLLECT_FULL],
+               ao_lisp_loops[AO_LISP_COLLECT_INCREMENTAL]);
+
+       printf("loops per collect: full %f incremental %f\n",
+              (double) ao_lisp_loops[AO_LISP_COLLECT_FULL] /
+              (double) ao_lisp_collects[AO_LISP_COLLECT_FULL],
+              (double) ao_lisp_loops[AO_LISP_COLLECT_INCREMENTAL] /
+              (double) ao_lisp_collects[AO_LISP_COLLECT_INCREMENTAL]);
+
+       printf("freed per collect: full %f incremental %f\n",
+              (double) ao_lisp_freed[AO_LISP_COLLECT_FULL] /
+              (double) ao_lisp_collects[AO_LISP_COLLECT_FULL],
+              (double) ao_lisp_freed[AO_LISP_COLLECT_INCREMENTAL] /
+              (double) ao_lisp_collects[AO_LISP_COLLECT_INCREMENTAL]);
+
+       printf("freed per loop: full %f incremental %f\n",
+              (double) ao_lisp_freed[AO_LISP_COLLECT_FULL] /
+              (double) ao_lisp_loops[AO_LISP_COLLECT_FULL],
+              (double) ao_lisp_freed[AO_LISP_COLLECT_INCREMENTAL] /
+              (double) ao_lisp_loops[AO_LISP_COLLECT_INCREMENTAL]);
 }