X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmodel-checker.c;h=ee13422a046cad95519c405042e63003065db716;hb=037d8f6e7932459b5d0fb479a2c5030a8088f3d1;hp=80198f82bc76262b60b2841be92a25e8ce1cc648;hpb=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp

diff --git a/src/libpspp/model-checker.c b/src/libpspp/model-checker.c
index 80198f82bc..ee13422a04 100644
--- a/src/libpspp/model-checker.c
+++ b/src/libpspp/model-checker.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
 
    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
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <libpspp/model-checker.h>
+#include "libpspp/model-checker.h"
 
 #include <limits.h>
 #include <signal.h>
@@ -26,16 +26,16 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <libpspp/argv-parser.h>
-#include <libpspp/bit-vector.h>
-#include <libpspp/compiler.h>
-#include <libpspp/deque.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include "libpspp/argv-parser.h"
+#include "libpspp/bit-vector.h"
+#include "libpspp/compiler.h"
+#include "libpspp/deque.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
 
-#include "error.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/error.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* Initializes PATH as an empty path. */
 void
@@ -120,7 +120,7 @@ mc_path_to_string (const struct mc_path *path, struct string *string)
   for (i = 0; i < mc_path_get_length (path); i++)
     {
       if (i > 0)
-        ds_put_char (string, ' ');
+        ds_put_byte (string, ' ');
       ds_put_format (string, "%d", mc_path_get_operation (path, i));
     }
 }
@@ -707,7 +707,7 @@ mc_parser_option_callback (int id, void *mc_options_)
         mc_options_set_strategy (options, MC_RANDOM);
       else
         error (1, 0,
-               "strategy must be \"broad\", \"deep\", or \"random\"");
+               "strategy must be `broad', `deep', or `random'");
       break;
 
     case OPT_MAX_DEPTH:
@@ -756,8 +756,8 @@ mc_parser_option_callback (int id, void *mc_options_)
       else if (!strcmp (optarg, "random"))
         mc_options_set_queue_limit_strategy (options, MC_DROP_RANDOM);
       else
-        error (1, 0, "--queue-drop argument must be \"newest\", "
-               "\"oldest\", or \"random\"");
+        error (1, 0, "--queue-drop argument must be `newest' "
+               "`oldest' or `random'");
       break;
 
     case OPT_SEED:
@@ -886,7 +886,7 @@ struct mc_results
 static struct mc_results *
 mc_results_create (void)
 {
-  struct mc_results *results = xcalloc (1, sizeof (struct mc_results));
+  struct mc_results *results = XCALLOC (1,  struct mc_results);
   results->stop_reason = MC_CONTINUING;
   gettimeofday (&results->start, NULL);
   return results;
@@ -1150,7 +1150,7 @@ struct mc
 
     /* Array of 2**(options->hash_bits) bits representing states
        already visited. */
-    unsigned char *hash;
+    unsigned long int *hash;
 
     /* State queue. */
     struct mc_state **queue;            /* Array of pointers to states. */
@@ -1269,7 +1269,7 @@ mc_discard_dup_state (struct mc *mc, unsigned int hash)
   if (!mc->state_error && mc->options->hash_bits > 0)
     {
       hash &= (1u << mc->options->hash_bits) - 1;
-      if (TEST_BIT (mc->hash, hash))
+      if (bitvector_is_set (mc->hash, hash))
         {
           if (mc->options->verbosity > 2)
             fprintf (mc->options->output_file,
@@ -1278,7 +1278,7 @@ mc_discard_dup_state (struct mc *mc, unsigned int hash)
           next_operation (mc);
           return true;
         }
-      SET_BIT (mc->hash, hash);
+      bitvector_set1 (mc->hash, hash);
     }
   return false;
 }
@@ -1688,7 +1688,7 @@ init_mc (struct mc *mc, const struct mc_class *class,
   mc->results = mc_results_create ();
 
   mc->hash = (mc->options->hash_bits > 0
-              ? xcalloc (1, DIV_RND_UP (1 << mc->options->hash_bits, CHAR_BIT))
+              ? bitvector_allocate (1 << mc->options->hash_bits)
               : NULL);
 
   mc->queue = NULL;
@@ -1743,7 +1743,7 @@ finish_mc (struct mc *mc)
   /* Free memory. */
   mc_path_destroy (&mc->path);
   ds_destroy (&mc->path_string);
-  free (mc->options);
+  mc_options_destroy (mc->options);
   free (mc->queue);
   free (mc->hash);
 }