Browse Source

*** empty log message ***

Mike Goslin 24 years ago
parent
commit
6c0b9429a5

+ 9 - 0
panda/src/downloader/decompressor.cxx

@@ -69,6 +69,9 @@ Decompressor(PT(Buffer) buffer) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Decompressor::
 void Decompressor::
 init(PT(Buffer) buffer) {
 init(PT(Buffer) buffer) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "Decompressor constructor called" << endl;
   _initiated = false;
   _initiated = false;
   nassertv(!buffer.is_null());
   nassertv(!buffer.is_null());
   _half_buffer_length = buffer->get_length()/2;
   _half_buffer_length = buffer->get_length()/2;
@@ -87,6 +90,9 @@ init(PT(Buffer) buffer) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Decompressor::
 Decompressor::
 ~Decompressor(void) {
 ~Decompressor(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "Decompressor destructor called" << endl;
   _temp_file_name.unlink();
   _temp_file_name.unlink();
   if (_initiated == true)
   if (_initiated == true)
     cleanup();
     cleanup();
@@ -219,6 +225,9 @@ initiate(Ramfile &source_file) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Decompressor::
 void Decompressor::
 cleanup(void) {
 cleanup(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "Decompressor cleanup called" << endl;
   if (_initiated == false) {
   if (_initiated == false) {
     downloader_cat.error()
     downloader_cat.error()
       << "Decompressor::cleanup() - Decompression has not been "
       << "Decompressor::cleanup() - Decompression has not been "

+ 6 - 0
panda/src/downloader/downloadDb.cxx

@@ -40,6 +40,9 @@ PN_uint32 DownloadDb::_bogus_magic_number = 0x11111111;
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 DownloadDb::
 DownloadDb::
 DownloadDb(Ramfile &server_file, Filename &client_file) {
 DownloadDb(Ramfile &server_file, Filename &client_file) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "DownloadDb constructor called" << endl;
   _client_db = read_db(client_file, 0);
   _client_db = read_db(client_file, 0);
   _client_db._filename = client_file;
   _client_db._filename = client_file;
   _server_db = read_db(server_file, 1);
   _server_db = read_db(server_file, 1);
@@ -63,6 +66,9 @@ DownloadDb(void) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 DownloadDb::
 DownloadDb::
 ~DownloadDb(void) {
 ~DownloadDb(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "DownloadDb destructor called" << endl;    
 }
 }
 
 
 
 

+ 9 - 0
panda/src/downloader/extractor.cxx

@@ -56,6 +56,9 @@ Extractor(PT(Buffer) buffer) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Extractor::
 void Extractor::
 init(PT(Buffer) buffer) {
 init(PT(Buffer) buffer) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "Extractor constructor called" << endl;
   _initiated = false;
   _initiated = false;
   nassertv(!buffer.is_null());
   nassertv(!buffer.is_null());
   _buffer = buffer;
   _buffer = buffer;
@@ -69,6 +72,9 @@ init(PT(Buffer) buffer) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Extractor::
 Extractor::
 ~Extractor(void) {
 ~Extractor(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "Extractor destructor called" << endl;
   if (_initiated == true)
   if (_initiated == true)
     cleanup();
     cleanup();
 }
 }
@@ -120,6 +126,9 @@ initiate(Filename &source_file, const Filename &rel_path) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Extractor::
 void Extractor::
 cleanup(void) {
 cleanup(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "Extractor cleanup called" << endl;
   if (_initiated == false) {
   if (_initiated == false) {
     downloader_cat.error()
     downloader_cat.error()
       << "Extractor::cleanup() - Extraction has not been initiated"
       << "Extractor::cleanup() - Extraction has not been initiated"

+ 12 - 0
panda/src/downloader/zcompressor.cxx

@@ -37,6 +37,9 @@
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 ZCompressor::
 ZCompressor::
 ZCompressor(void) {
 ZCompressor(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "ZCompressor constructor called" << endl;
   _stream = new z_stream;
   _stream = new z_stream;
   reset_stream(_stream);
   reset_stream(_stream);
   int ret = deflateInit(_stream, 9);
   int ret = deflateInit(_stream, 9);
@@ -54,6 +57,9 @@ ZCompressor(void) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 ZCompressor::
 ZCompressor::
 ~ZCompressor(void) {
 ~ZCompressor(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "ZCompressor destructor called" << endl;
   handle_zerror(deflateEnd(_stream), _stream);
   handle_zerror(deflateEnd(_stream), _stream);
   delete _stream;
   delete _stream;
 }
 }
@@ -109,6 +115,9 @@ compress_to_stream(char *&next_in, int &avail_in, char *&next_out,
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 ZDecompressor::
 ZDecompressor::
 ZDecompressor(void) {
 ZDecompressor(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "ZDecompressor constructor called" << endl;
   _stream = new z_stream;
   _stream = new z_stream;
   reset_stream(_stream);
   reset_stream(_stream);
   int ret = inflateInit(_stream);
   int ret = inflateInit(_stream);
@@ -126,6 +135,9 @@ ZDecompressor(void) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 ZDecompressor::
 ZDecompressor::
 ~ZDecompressor(void) {
 ~ZDecompressor(void) {
+  if (downloader_cat.is_debug())
+    downloader_cat.debug()
+      << "ZDecompressor destructor called" << endl;
   handle_zerror(inflateEnd(_stream), _stream);
   handle_zerror(inflateEnd(_stream), _stream);
 }
 }
 
 

+ 22 - 3
panda/src/express/multifile.cxx

@@ -37,6 +37,9 @@ PN_uint32 Multifile::_magic_number = 0xbeeffeeb;
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Multifile::Memfile::
 Multifile::Memfile::
 Memfile(void) {
 Memfile(void) {
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile::Memfile constructor called" << endl;
   reset();
   reset();
   _header_length_buf_length = sizeof(_header_length);
   _header_length_buf_length = sizeof(_header_length);
   _header_length_buf = new char[_header_length_buf_length];
   _header_length_buf = new char[_header_length_buf_length];
@@ -49,6 +52,9 @@ Memfile(void) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Multifile::Memfile::
 Multifile::Memfile::
 ~Memfile(void) {
 ~Memfile(void) {
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile::Memfile destructor called" << endl;
   if (_buffer != (char *)0L)
   if (_buffer != (char *)0L)
     delete _buffer;
     delete _buffer;
   _buffer = (char *)0L;
   _buffer = (char *)0L;
@@ -62,6 +68,9 @@ Multifile::Memfile::
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Multifile::Memfile::
 void Multifile::Memfile::
 reset(void) {
 reset(void) {
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile::Memfile reset called" << endl;
   _header_length_parsed = false;
   _header_length_parsed = false;
   _header_parsed = false;
   _header_parsed = false;
   _header_length = 0;
   _header_length = 0;
@@ -107,9 +116,10 @@ parse_header_length(char *&start, int &size) {
   DatagramIterator di(_datagram);
   DatagramIterator di(_datagram);
   _header_length = di.get_int32();
   _header_length = di.get_int32();
 
 
-  express_cat.debug()
-    << "Multifile::Memfile::parse_header_length() - header length: "
-    << _header_length << endl;
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile::Memfile::parse_header_length() - header length: "
+      << _header_length << endl;
 
 
   nassertr(_header_length > _header_length_buf_length + (int)sizeof(_buffer_length), false);
   nassertr(_header_length > _header_length_buf_length + (int)sizeof(_buffer_length), false);
 
 
@@ -361,6 +371,9 @@ write(char *&start, int &size, const Filename &rel_path) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Multifile::
 Multifile::
 Multifile(void) {
 Multifile(void) {
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile constructor called" << endl;
   reset();
   reset();
   _header_length = sizeof(_magic_number) + sizeof(_num_mfiles);
   _header_length = sizeof(_magic_number) + sizeof(_num_mfiles);
 }
 }
@@ -372,6 +385,9 @@ Multifile(void) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 Multifile::
 Multifile::
 ~Multifile(void) {
 ~Multifile(void) {
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile destructor called" << endl;
   _files.erase(_files.begin(), _files.end());
   _files.erase(_files.begin(), _files.end());
   if (_current_mfile != NULL)
   if (_current_mfile != NULL)
     delete _current_mfile;
     delete _current_mfile;
@@ -652,6 +668,9 @@ write_extract(char *&start, int &size, const Filename &rel_path) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Multifile::
 void Multifile::
 reset(void) {
 reset(void) {
+  if (express_cat.is_debug())
+    express_cat.debug()
+      << "Multifile reset called" << endl;
   _header_parsed = false;
   _header_parsed = false;
   _num_mfiles = 0;
   _num_mfiles = 0;
   _current_mfile = (Memfile *)0L;
   _current_mfile = (Memfile *)0L;