dedicated repl output

Signed-off-by: Sarthak Aggarwal <[email protected]>

Author: sarthakaggarwal97

src/childinfo.c

@@ -36,7 +36,7 @@ typedef struct {
     size_t cow;
     monotime cow_updated;
     double progress;
-    size_t output;
+    size_t repl_output_bytes;
     childInfoType information_type; /* Type of information */
 } child_info_data;
 
@@ -65,7 +65,7 @@ void closeChildInfoPipe(void) {
 }
 
 /* Send save data to parent. */
-void sendChildInfoGeneric(childInfoType info_type, size_t keys, size_t output, double progress, char *pname) {
+void sendChildInfoGeneric(childInfoType info_type, size_t keys, size_t repl_output_bytes, double progress, char *pname) {
     if (server.child_info_pipe[1] == -1) return;
 
     static monotime cow_updated = 0;
@@ -102,7 +102,7 @@ void sendChildInfoGeneric(childInfoType info_type, size_t keys, size_t output, d
 
     data.information_type = info_type;
     data.keys = keys;
-    data.output = output;
+    data.repl_output_bytes = repl_output_bytes;
     data.cow = cow;
     data.cow_updated = cow_updated;
     data.progress = progress;
@@ -117,7 +117,7 @@ void sendChildInfoGeneric(childInfoType info_type, size_t keys, size_t output, d
 }
 
 /* Update Child info. */
-void updateChildInfo(childInfoType information_type, size_t cow, monotime cow_updated, size_t keys, size_t output, double progress) {
+void updateChildInfo(childInfoType information_type, size_t cow, monotime cow_updated, size_t keys, size_t repl_output_bytes, double progress) {
     if (cow > server.stat_current_cow_peak) server.stat_current_cow_peak = cow;
 
     if (information_type == CHILD_INFO_TYPE_CURRENT_INFO) {
@@ -132,15 +132,15 @@ void updateChildInfo(childInfoType information_type, size_t cow, monotime cow_up
     } else if (information_type == CHILD_INFO_TYPE_MODULE_COW_SIZE) {
         server.stat_module_cow_bytes = server.stat_current_cow_peak;
     } else if (information_type == CHILD_INFO_TYPE_REPL_OUTPUT_BYTES) {
-        server.stat_net_repl_output_bytes += (long long)output;
+        server.stat_net_repl_output_bytes += (long long)repl_output_bytes;
     }
 }
 
 /* Read child info data from the pipe.
  * if complete data read into the buffer,
  * data is stored into *buffer, and returns 1.
  * otherwise, the partial data is left in the buffer, waiting for the next read, and returns 0. */
-int readChildInfo(childInfoType *information_type, size_t *cow, monotime *cow_updated, size_t *keys, size_t *output, double *progress) {
+int readChildInfo(childInfoType *information_type, size_t *cow, monotime *cow_updated, size_t *keys, size_t *repl_output_bytes, double *progress) {
     /* We are using here a static buffer in combination with the server.child_info_nread to handle short reads */
     static child_info_data buffer;
     ssize_t wlen = sizeof(buffer);
@@ -160,7 +160,7 @@ int readChildInfo(childInfoType *information_type, size_t *cow, monotime *cow_up
         *cow = buffer.cow;
         *cow_updated = buffer.cow_updated;
         *keys = buffer.keys;
-        *output = buffer.output;
+        *repl_output_bytes = buffer.repl_output_bytes;
         *progress = buffer.progress;
         return 1;
     } else {
@@ -175,12 +175,12 @@ void receiveChildInfo(void) {
     size_t cow;
     monotime cow_updated;
     size_t keys;
-    size_t output;
+    size_t repl_output_bytes;
     double progress;
     childInfoType information_type;
 
     /* Drain the pipe and update child info so that we get the final message. */
-    while (readChildInfo(&information_type, &cow, &cow_updated, &keys, &output, &progress)) {
-        updateChildInfo(information_type, cow, cow_updated, keys, output, progress);
+    while (readChildInfo(&information_type, &cow, &cow_updated, &keys, &repl_output_bytes, &progress)) {
+        updateChildInfo(information_type, cow, cow_updated, keys, repl_output_bytes, progress);
     }
 }

src/server.h

@@ -3157,7 +3157,7 @@ int rewriteSlotToAppendOnlyFileRio(rio *aof, int db_num, int hashslot, size_t *k
 /* Child info */
 void openChildInfoPipe(void);
 void closeChildInfoPipe(void);
-void sendChildInfoGeneric(childInfoType info_type, size_t keys, size_t output, double progress, char *pname);
+void sendChildInfoGeneric(childInfoType info_type, size_t keys, size_t repl_output_bytes, double progress, char *pname);
 void sendChildCowInfo(childInfoType info_type, char *pname);
 void sendChildInfo(childInfoType info_type, size_t keys, char *pname);
 void receiveChildInfo(void);