# 
# 
# patch "enumerator.cc"
#  from [fced10d3654e3cfb37e9ad3e6d74238bd796737e]
#    to [5ca3baa39f04624fd9342bc8f370b8fbc96d82ca]
# 
# patch "netcmd.cc"
#  from [7d4623fa34ca32a1217a77fe3c5e3041d33daee4]
#    to [43a077525d23c4841f5bdaa6afb33150c543ca69]
# 
# patch "netsync.cc"
#  from [d28efc3e97f8f0f74784f0f945bb78532ba9b3e6]
#    to [8f8efc71ddee66d028c6109eb91818566d926a1a]
# 
# patch "packet.cc"
#  from [2d1b7869384bbb9c35573e3aa29d6f5fc81549d1]
#    to [6c8855a5184c4abb4485e315e3e28e848f5bb564]
# 
# patch "refiner.cc"
#  from [17fef57cd7411873901a8a58a69eef603b417dd4]
#    to [826ecae4d4133f4622670a807d5d1055e35c1979]
# 
============================================================
--- enumerator.cc	fced10d3654e3cfb37e9ad3e6d74238bd796737e
+++ enumerator.cc	5ca3baa39f04624fd9342bc8f370b8fbc96d82ca
@@ -46,21 +46,17 @@
 void 
 revision_enumerator::step()
 {
-  P(F("stepping...\n"));
   while (!done())
     {
       if (items.empty() && !revs.empty())
         {
           revision_id r = revs.front();
           revs.pop_front();
-
-          P(F("step examining rev '%d'\n") % r);
           
           if (terminal_nodes.find(r) == terminal_nodes.end())
             {
               set<revision_id> children;
               app.db.get_revision_children(r, children);
-              P(F("step expanding %d children of rev '%d'\n") % children.size() % r);
               for (set<revision_id>::const_iterator i = children.begin();
                    i != children.end(); ++i)
                 revs.push_back(*i);
@@ -71,7 +67,8 @@
 
           if (cb.process_this_rev(r))
             {
-              P(F("step expanding contents of rev '%d'\n") % r);
+              L(F("revision_enumerator::step expanding "
+                  "contents of rev '%d'\n") % r);
 
               revision_set rs;
               app.db.get_revision(r, rs);
@@ -130,7 +127,7 @@
 
       if (!items.empty())
         {
-          P(F("step extracting item\n"));
+          L(F("revision_enumerator::step extracting item\n"));
 
           enumerator_item i = items.front();
           items.pop_front();
============================================================
--- netcmd.cc	7d4623fa34ca32a1217a77fe3c5e3041d33daee4
+++ netcmd.cc	43a077525d23c4841f5bdaa6afb33150c543ca69
@@ -111,7 +111,6 @@
     case static_cast<u8>(delta_cmd):
     case static_cast<u8>(usher_cmd):
       cmd_code = static_cast<netcmd_code>(cmd_byte);
-      P(F("examining command type %d\n") % cmd_code);
       break;
     default:
       throw bad_decode(F("unknown netcmd code 0x%x") % widen<u32,u8>(cmd_byte));
============================================================
--- netsync.cc	d28efc3e97f8f0f74784f0f945bb78532ba9b3e6
+++ netsync.cc	8f8efc71ddee66d028c6109eb91818566d926a1a
@@ -723,7 +723,6 @@
     && cert_refiner.done() 
     && key_refiner.done()
     && epoch_refiner.done();
-  P(F("done all refinements? %d\n") % all);
   return all;  
 }
 
@@ -738,7 +737,6 @@
     && cert_refiner.items_to_receive.empty()
     && key_refiner.items_to_receive.empty()
     && epoch_refiner.items_to_receive.empty();
-  P(F("received all items? %d\n") % all);
   return all;
 }
 
@@ -749,7 +747,6 @@
     && received_all_items()
     && queued_all_items()
     && rev_enumerator.done();
-  P(F("finished working? %d\n") % all);
   return all;
 }
 
@@ -762,7 +759,6 @@
     && cert_refiner.items_to_send.empty()
     && key_refiner.items_to_send.empty()
     && epoch_refiner.items_to_send.empty();
-  P(F("queued all items? %d\n") % all);
   return all;
 }
 
@@ -963,7 +959,7 @@
 void 
 session::queue_bye_cmd(u8 phase) 
 {
-  P(F("queueing 'bye' command, phase %d\n") 
+  L(F("queueing 'bye' command, phase %d\n") 
     % static_cast<size_t>(phase));
   netcmd cmd;
   cmd.write_bye_cmd(phase);
@@ -976,7 +972,8 @@
 {
   string typestr;
   netcmd_item_type_to_string(type, typestr);
-  P(F("queueing 'done' command for %s level %s\n") % typestr % level);
+  L(F("queueing 'done' command for %s level %s\n") 
+    % typestr % level);
   netcmd cmd;
   cmd.write_done_cmd(level, type);
   write_netcmd_and_try_flush(cmd);
@@ -1045,7 +1042,7 @@
   hexenc<prefix> hpref;
   node.get_hex_prefix(hpref);
   netcmd_item_type_to_string(node.type, typestr);
-  P(F("queueing request for refinement of %s node '%s', level %d\n")
+  L(F("queueing request for refinement of %s node '%s', level %d\n")
     % typestr % hpref % static_cast<int>(node.level));
   netcmd cmd;
   cmd.write_refine_cmd(node);
@@ -1059,7 +1056,7 @@
   hexenc<id> hitem;
   encode_hexenc(item, hitem);
   netcmd_item_type_to_string(ty, typestr);
-  P(F("queueing note about %s item '%s'") % typestr % hitem);
+  L(F("queueing note about %s item '%s'") % typestr % hitem);
   netcmd cmd;
   cmd.write_note_item_cmd(ty, item);
   write_netcmd_and_try_flush(cmd);  
@@ -1096,7 +1093,7 @@
       return;
     }
 
-  P(F("queueing %d bytes of data for %s item '%s'\n")
+  L(F("queueing %d bytes of data for %s item '%s'\n")
     % dat.size() % typestr % hid);
 
   netcmd cmd;
@@ -1135,7 +1132,7 @@
       return;
     }
 
-  P(F("queueing %s delta '%s' -> '%s'\n")
+  L(F("queueing %s delta '%s' -> '%s'\n")
     % typestr % base_hid % ident_hid);
   netcmd cmd;
   cmd.write_delta_cmd(type, base, ident, del);
@@ -1531,7 +1528,7 @@
 {
   string typestr;
   netcmd_item_type_to_string(node.type, typestr);
-  P(F("processing refine cmd for %s node at level %d\n")
+  L(F("processing refine cmd for %s node at level %d\n")
     % typestr % node.level);
 
   switch (node.type)
@@ -1917,7 +1914,6 @@
             throw bad_decode(F("hash check failed for public key '%s' (%s);"
                                " wanted '%s' got '%s'")  
                              % hitem % keyid % hitem % tmp);
-          P(F("writing public key '%s' (item %s)\n") % keyid % tmp);
           this->dbw.consume_public_key(keyid, pub);
         }
       break;
@@ -2031,11 +2027,8 @@
       hexenc<id> hitem;
       encode_hexenc(*i, hitem);
 
-      P(F("send_all_data: %s item '%s'\n") % typestr % hitem);
-
       if (data_exists(ty, *i, this->app))
         {
-          P(F("send_all_data: %s item '%s' exists, sending\n") % typestr % hitem);
           string out;
           load_data(ty, *i, this->app, out);
           queue_data_cmd(ty, *i, out);
@@ -2244,30 +2237,24 @@
 void 
 session::maybe_step()
 {
-  P(F("+maybe_step\n"));
   if (done_all_refinements()
       && !rev_enumerator.done()
       && outbuf_size < constants::bufsz * 10)
     {
-      P(F("stepping enumerator\n"));
       rev_enumerator.step();
     }
-  P(F("-maybe_step\n"));
 }
 
 void 
 session::maybe_say_goodbye()
 {
-  P(F("+maybe say goodbye\n"));
   if (voice == client_voice
       && protocol_state == working_state
       && finished_working())
     {
-      P(F("initiating shutdown\n"));
       protocol_state = shutdown_state;
       queue_bye_cmd(0);
     }
-  P(F("-maybe say goodbye\n"));
 }
 
 bool 
@@ -2304,7 +2291,7 @@
       guard.commit();
       
       if (!ret)
-        P(F("finishing processing with '%d' packet") % cmd.get_cmd_code());
+        L(F("finishing processing with '%d' packet") % cmd.get_cmd_code());
       return ret;
     }
   catch (bad_decode & bd)
@@ -2708,8 +2695,8 @@
                 
               if (live_p && (event & Netxx::Probe::ready_oobd))
                 {
-                  P(F("got some OOB data on fd %d (peer %s), disconnecting\n") 
-                    % fd % sess->peer_id);
+                  P(F("got OOB from peer %s, disconnecting\n") 
+                    % sess->peer_id);
                   sessions.erase(i);
                 }
             }
@@ -2891,7 +2878,7 @@
           app.db.get_key(*key, pub_encoded);
           hexenc<id> keyhash;
           key_hash_code(*key, pub_encoded, keyhash);
-          P(F("noting key '%s' = '%s' to send\n") % *key % keyhash);
+          L(F("noting key '%s' = '%s' to send\n") % *key % keyhash);
           id key_item;
           decode_hexenc(keyhash, key_item);
           key_refiner.note_local_item(key_item);
============================================================
--- packet.cc	2d1b7869384bbb9c35573e3aa29d6f5fc81549d1
+++ packet.cc	6c8855a5184c4abb4485e315e3e28e848f5bb564
@@ -488,11 +488,11 @@
       app.db.get_key(ident, tmp);
       if (!keys_match(ident, tmp, ident, k))
         W(F("key '%s' is not equal to key '%s' in database\n") % ident % ident);
-      P(F("skipping existing public key %s\n") % ident);
+      L(F("skipping existing public key %s\n") % ident);
       return;
     }
 
-  P(F("putting public key %s\n") % ident);
+  L(F("putting public key %s\n") % ident);
   app.db.put_key(ident, k);
   if (on_pubkey_written) 
     on_pubkey_written(ident);
@@ -555,7 +555,7 @@
 void
 packet_db_valve::open_valve()
 {
-  P(F("packet valve opened\n"));
+  L(F("packet valve opened\n"));
   pimpl->valve_is_open = true;
   int written = 0;
   for (std::vector< boost::shared_ptr<delayed_packet> >::reverse_iterator
@@ -567,7 +567,7 @@
       ++written;
     }
   pimpl->packets.clear();
-  P(F("wrote %i queued packets\n") % written);
+  L(F("wrote %i queued packets\n") % written);
 }
 
 #define DOIT(x) pimpl->do_packet(boost::shared_ptr<delayed_packet>(new x));
============================================================
--- refiner.cc	17fef57cd7411873901a8a58a69eef603b417dd4
+++ refiner.cc	826ecae4d4133f4622670a807d5d1055e35c1979
@@ -133,9 +133,9 @@
   string typestr;
   netcmd_item_type_to_string(type, typestr);
   
-  P(F("pid %d determined %d %s items to send\n") 
+  L(F("pid %d determined %d %s items to send\n") 
     % getpid() % items_to_send.size() % typestr);
-  P(F("pid %d determined %d %s items to receive\n") 
+  L(F("pid %d determined %d %s items to receive\n") 
     % getpid() % items_to_receive.size() % typestr);
   calculated_items_to_send_and_receive = true;
 }
@@ -275,7 +275,7 @@
   string typestr;
   netcmd_item_type_to_string(type, typestr);
 
-  P(F("pid %d processing 'done' command on %s level %d\n")
+  L(F("pid %d processing 'done' command on %s level %d\n")
     % getpid() % typestr % level);
 
   if (!exchanged_data_since_last_done_cmd 
@@ -284,11 +284,11 @@
       // Echo 'done' if we're shutting down
       if (finished_refinement < 3)
         {
-          P(F("pid %d processing 'done' command => echoing shut down of %s refinement\n")
+          L(F("pid %d processing 'done' command => echoing shut down of %s refinement\n")
             % getpid() % typestr);
           cb.queue_done_cmd(level+1, type);
         }
-      P(F("pid %d processing 'done' command => shut down %s refinement\n")
+      L(F("pid %d processing 'done' command => shut down %s refinement\n")
         % getpid() % typestr);
       
       // Mark ourselves shut down
@@ -301,7 +301,7 @@
            && finished_refinement < 2)
     {
       // Echo 'done', we're still active.
-      P(F("pid %d processing 'done' command => continuing to %s level %d\n")
+      L(F("pid %d processing 'done' command => continuing to %s level %d\n")
         % getpid() % typestr % (level+1));
       cb.queue_done_cmd(level+1, type);
     }
@@ -316,7 +316,8 @@
   string typestr;
   netcmd_item_type_to_string(type, typestr);
 
-  P(F("%s refiner %s done\n") % typestr % (finished_refinement >= 2 ? "is" : "is not"));
+  L(F("%s refiner %s done\n") 
+    % typestr % (finished_refinement >= 2 ? "is" : "is not"));
   return finished_refinement >= 2;
 }