nnrpd: Fix timer statistics when COMPRESS is used

InterNetNews · Nov 20, 2021 · 37fad36 · 37fad36
1 parent 2ec7f68
commit 37fad36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/doc/pod/news.pod b/doc/pod/news.pod
@@ -38,6 +38,11 @@ for the path.
 
 =item *
 
+B<nnrpd> now properly gathers timer statistics when a compression layer
+is active.
+
+=item *
+
 B<innfeed> and B<ovdb_stat> now generate status reports in valid HTML syntax.
 
 =item *

diff --git a/nnrpd/article.c b/nnrpd/article.c
@@ -77,6 +77,8 @@ PushIOvHelper(struct iovec* vec, int* countp)
         }
 
         *countp = 0;
+
+        TMRstop(TMR_NNTPWRITE);
         return;
     }
 #endif /* HAVE_ZLIB */

diff --git a/nnrpd/nnrpd.c b/nnrpd/nnrpd.c
@@ -706,6 +706,7 @@ write_buffer(const char *buff, ssize_t len)
                 sysnotice("deflate() failed: %d; %s", r,
                           zstream_out->msg != NULL ? zstream_out->msg :
                           "no detail");
+                TMRstop(TMR_NNTPWRITE);
                 return;
             }
         } while (r == Z_OK && zstream_out->avail_out == 0);
@@ -732,6 +733,7 @@ write_buffer(const char *buff, ssize_t len)
                 sysnotice("sasl_encode() failed: %s; %s",
                           sasl_errstring(r, NULL, NULL),
                           ed != NULL ? ed : "no detail");
+                TMRstop(TMR_NNTPWRITE);
                 return;
             }
         } else