Merge branch 'dev' of feistymeow.org:feisty_meow into dev

[feisty_meow.git] / octopi / library / cromp / cromp_common.cpp

diff --git a/octopi/library/cromp/cromp_common.cpp b/octopi/library/cromp/cromp_common.cpp
index 107d92ae337fa30d69239fef63e2338c4edfdb0b..3a05e9ec3cfd6eca5a7f061c22b13bf74398aadf 100644 (file)
--- a/octopi/library/cromp/cromp_common.cpp
+++ b/octopi/library/cromp/cromp_common.cpp
@@ -128,19 +128,19 @@ double cromp_common::_bytes_received_total = 0.0;
   }
 
 cromp_common::cromp_common(const astring &host, int max_per_ent)
-: _commlink(NIL),
+: _commlink(NULL_POINTER),
   _octopus(new octopus(host, max_per_ent)),
-  _singleton(NIL),
+  _singleton(NULL_POINTER),
   _requests(new entity_data_bin(max_per_ent)),
   _accum_lock(new mutex),
   _last_data_seen(new time_stamp),
-  _accumulator(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
-  _sendings(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
-  _receive_buffer(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
-  _still_flat(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
+  _accumulator(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
+  _sendings(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
+  _receive_buffer(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
+  _still_flat(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
   _last_cleanup(new time_stamp)
 {
-//  FUNCDEF("constructor [host/max_per_ent]");
+  FUNCDEF("constructor [host/max_per_ent]");
   // clear pre-existing space.
   _accumulator->reset();
   _sendings->reset();
@@ -157,16 +157,16 @@ cromp_common::cromp_common(spocket *preexisting, octopus *singleton)
           : DEFAULT_MAX_ENTITY_QUEUE)),
   _accum_lock(new mutex),
   _last_data_seen(new time_stamp),
-  _accumulator(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
-  _sendings(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
-  _receive_buffer(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
-  _still_flat(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NIL)),
+  _accumulator(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
+  _sendings(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
+  _receive_buffer(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
+  _still_flat(new byte_array(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER)),
   _last_cleanup(new time_stamp)
 {
   FUNCDEF("constructor [preexisting/singleton]");
   if (!_octopus) {
     // they passed us a bad singleton.  carry on as best we can.
-    LOG("singleton passed as NIL; constructing new octopus instead.");
+    LOG("singleton passed as NULL_POINTER; constructing new octopus instead.");
     internet_address local(internet_address::localhost(), "localhost", 0);
     _octopus = new octopus(chew_hostname(local), DEFAULT_MAX_ENTITY_QUEUE);
   }
@@ -179,11 +179,11 @@ cromp_common::cromp_common(spocket *preexisting, octopus *singleton)
 
 cromp_common::~cromp_common()
 {
-//  FUNCDEF("destructor");
+  FUNCDEF("destructor");
   close_common();  // shuts down our socket and other stuff.
   if (_singleton) {
-    _singleton = NIL;  // reset the pointer we had.
-    _octopus = NIL;  // ditto.
+    _singleton = NULL_POINTER;  // reset the pointer we had.
+    _octopus = NULL_POINTER;  // ditto.
   } else {
     // this one was ours so we need to clean it up.
     WHACK(_octopus);
@@ -277,7 +277,7 @@ void cromp_common::max_bytes_per_entity(int max_bytes_per_entity)
 
 void cromp_common::conditional_cleaning()
 {
-//  FUNCDEF("conditional_cleaning");
+  FUNCDEF("conditional_cleaning");
   if (time_stamp(-CLEANUP_INTERVAL) > *_last_cleanup) {
     _requests->clean_out_deadwood();
       // flush any items that are too old.
@@ -500,8 +500,8 @@ outcome cromp_common::send_buffer()
 outcome cromp_common::retrieve_and_restore_root(bool get_anything,
     infoton * &item, octopus_request_id &req_id, int timeout)
 {
-//  FUNCDEF("retrieve_and_restore_root");
-  item = NIL;
+  FUNCDEF("retrieve_and_restore_root");
+  item = NULL_POINTER;
   if (!_commlink) return BAD_INPUT;  // they haven't opened this yet.
   octopus_request_id tmp_id;
   time_stamp leaving_time(timeout);
@@ -628,7 +628,7 @@ void cromp_common::grab_anything(bool wait)
 void cromp_common::process_accumulator()
 {
   FUNCDEF("process_accumulator");
-  infoton *item = NIL;
+  infoton *item = NULL_POINTER;
   octopus_request_id req_id;
 
   string_array clas;
@@ -636,7 +636,7 @@ void cromp_common::process_accumulator()
   if (!_accumulator->length()) return;
 
   // a little gymnastics to get a large buffer on the first try.
-  byte_array temp_chow_buffer(CROMP_BUFFER_CHUNK_SIZE, NIL);
+  byte_array temp_chow_buffer(CROMP_BUFFER_CHUNK_SIZE, NULL_POINTER);
   temp_chow_buffer.reset();
 
   int cmds_found = 0;