From: Eduard Bagdasaryan Date: Sun, 11 Aug 2019 20:17:53 +0000 (+0000) Subject: Fixed MemStore::copyFromShm() debugging (#454) X-Git-Tag: SQUID_5_0_1~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb1f4f1df4e95ce5d0ec523e176deaf828360333;p=thirdparty%2Fsquid.git Fixed MemStore::copyFromShm() debugging (#454) * Level-9 is reserved for data dumps. * The "mem-loaded all" message was printing -1 instead of the accumulated object size. It also deserves a lower debugging level because it happens at most once per transaction. --- diff --git a/src/MemStore.cc b/src/MemStore.cc index 72def56305..ecc7672f45 100644 --- a/src/MemStore.cc +++ b/src/MemStore.cc @@ -479,7 +479,7 @@ MemStore::copyFromShm(StoreEntry &e, const sfileno index, const Ipc::StoreMapAnc wasEof = anchor.complete() && slice.next < 0; const Ipc::StoreMapSlice::Size wasSize = slice.size; - debugs(20, 9, "entry " << index << " slice " << sid << " eof " << + debugs(20, 8, "entry " << index << " slice " << sid << " eof " << wasEof << " wasSize " << wasSize << " <= " << anchor.basics.swap_file_sz << " sliceOffset " << sliceOffset << " mem.endOffset " << e.mem_obj->endOffset()); @@ -497,7 +497,7 @@ MemStore::copyFromShm(StoreEntry &e, const sfileno index, const Ipc::StoreMapAnc page + prefixSize); if (!copyFromShmSlice(e, sliceBuf, wasEof)) return false; - debugs(20, 9, "entry " << index << " copied slice " << sid << + debugs(20, 8, "entry " << index << " copied slice " << sid << " from " << extra.page << '+' << prefixSize); } // else skip a [possibly incomplete] slice that we copied earlier @@ -521,7 +521,7 @@ MemStore::copyFromShm(StoreEntry &e, const sfileno index, const Ipc::StoreMapAnc return true; } - debugs(20, 7, "mem-loaded all " << e.mem_obj->object_sz << '/' << + debugs(20, 5, "mem-loaded all " << e.mem_obj->endOffset() << '/' << anchor.basics.swap_file_sz << " bytes of " << e); // from StoreEntry::complete()