cleanup some loose ends

Author: genivia-inc

include/reflex/timer.h

@@ -59,14 +59,14 @@ inline float timer_elapsed(timer_type& t) ///< timer to be updated
 {
   timer_type now;
   GetLocalTime(&now);
-  float sec = now.wMilliseconds;
-  sec -= t.wMilliseconds;
+  float ms = now.wMilliseconds;
+  ms -= t.wMilliseconds;
   t.wMilliseconds = now.wMilliseconds;
-  sec += 1000.0f * (now.wSecond - t.wSecond);
+  ms += 1000.0f * (now.wSecond - t.wSecond);
   t.wSecond = now.wSecond;
-  if (sec < 0.0)
-    sec += 60000.0;
-  return sec;
+  if (ms < 0.0)
+    ms += 60000.0;
+  return ms;
 }
 
 } // namespace reflex
@@ -91,14 +91,14 @@ inline float timer_elapsed(timer_type& t) ///< timer to be updated
 {
   timer_type now;
   gettimeofday(&now, NULL);
-  float sec = now.tv_usec;
-  sec -= t.tv_usec;
+  float ms = now.tv_usec;
+  ms -= t.tv_usec;
   t.tv_usec = now.tv_usec;
-  sec = 1000.0 * (now.tv_sec - t.tv_sec) + sec/1000.0;
+  ms = 1000.0 * (now.tv_sec - t.tv_sec) + ms/1000.0;
   t.tv_sec = now.tv_sec;
-  if (sec < 0.0)
-    sec += 60000.0;
-  return sec;
+  if (ms < 0.0)
+    ms += 60000.0;
+  return ms;
 }
 
 } // namespace reflex

lib/input.cpp

@@ -1031,7 +1031,7 @@ bool Input::file_ready()
   if (file_ == NULL || feof(file_))
     return false;
 #if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
-  return true;
+  return !ferror(file_);
 #else
   if (ferror(file_))
   {
@@ -1042,9 +1042,8 @@ bool Input::file_ready()
     if (errno == EAGAIN)
     {
       struct stat buf;
-      fstat(fileno(file_), &buf);
-      if (S_ISREG(buf.st_mode))
-        return false;
+      if (fstat(fileno(file_), &buf) == 0 && S_ISREG(buf.st_mode))
+        return false
     }
 #endif
   }

lib/pattern.cpp

@@ -4404,7 +4404,7 @@ void Pattern::analyze_dfa(DFA::State *start)
     }
     for (Hash i = 0; i < Const::HASH; ++i)
     {
-      if (pma_[i] != (1 << (8 * Const::PM_M)) - 1)
+      if (pma_[i] != (1 << (2 * Const::PM_M)) - 1)
       {
         if (isprint(i))
           DBGLOGN("pma['%c'] = %04x", i, pma_[i]);
@@ -4541,14 +4541,14 @@ void Pattern::gen_predict_match_transitions(uint16_t level, DFA::State *state, c
     std::pair<ORanges<Hash>,ORanges<Char> > *next_hashes = (level + 1 < Const::BITS && !next_accept) ? &level_hashes[next_state] : NULL;
     Char lo = edge.lo();
     Char hi = edge.hi();
-    DBGLOG("PM level %zu %p: %u~%u %s%s", level, state, lo, hi, next_accept ? "accept " : "", next_hashes ? "nexthashes" : "");
+    DBGLOG("PM level %hu %p: %u~%u %s%s", level, state, lo, hi, next_accept ? "accept " : "", next_hashes ? "nexthashes" : "");
     if (level < min_)
     {
       // populate bit array
       Bitap mask = ~(1 << level);
       for (Char ch = lo; ch <= hi; ++ch)
         bit_[ch] &= mask;
-      DBGLOG("%zu bitap %p: %u..%u -> %p", level, state, lo, hi, next_state);
+      DBGLOG("%hu bitap %p: %u..%u -> %p", level, state, lo, hi, next_state);
       // update tap_[] bitap hashed pairs at previous level using previous character ranges
       mask >>= 1;
       for (ORanges<Char>::iterator prev_range = previous.second.begin(); prev_range != previous.second.end(); ++prev_range)

src/zthread.hpp

@@ -98,7 +98,11 @@ struct Zthread {
     pipe_fd[1] = -1;
   }
 
-  ~Zthread()
+  // no copy constructor
+  Zthread(const Zthread&) = delete;
+
+  // destructor
+  virtual ~Zthread()
   {
     // recursively join all stages of the decompression thread chain (--zmax>1), delete zstream
     join();
@@ -124,6 +128,7 @@ struct Zthread {
     // partnameref is not assigned yet, used only when this decompression thread is chained
     is_assigned = false;
 
+    // flag to inform main thread what's going on when it calls decompressing()
     is_compressed = false;
 
     // open pipe between the main thread or the previous decompression thread and this (new) decompression thread
@@ -233,12 +238,10 @@ struct Zthread {
       pipe_fd[0] = -1;
 
       // if extracting and the decompression filter thread is not yet waiting, then wait until decompression thread closed its end of the pipe
-      {
-        std::unique_lock<std::mutex> lock(pipe_mutex);
-        if (!is_waiting)
-          pipe_close.wait(lock);
-        lock.unlock();
-      }
+      std::unique_lock<std::mutex> lock(pipe_mutex);
+      if (!is_waiting)
+        pipe_close.wait(lock);
+      lock.unlock();
 
       // partnameref is not assigned yet, used only when this decompression thread is chained
       is_assigned = false;
@@ -254,8 +257,8 @@ struct Zthread {
           // if chained before another decompression thread
           if (is_chained)
           {
-            // use lock and wait for partname ready
-            std::unique_lock<std::mutex> lock(pipe_mutex);
+            // wait for partname ready
+            lock.lock();
             // notify the decompression filter thread of the new pipe
             pipe_ready.notify_one();
             // wait for the partname to be set by the next decompression thread in the ztchain
@@ -289,7 +292,7 @@ struct Zthread {
         pipe_ready.notify_one();
 
         // when an error occurred, we still need to notify the receiver in case it is waiting on the partname
-        std::unique_lock<std::mutex> lock(pipe_mutex);
+        lock.lock();
         is_assigned = true;
         part_ready.notify_one();
         lock.unlock();