file-reader: Use the already presented io job working flag to detect an in progress work item

Signed-off-by: Hofi <[email protected]>

Author: HofiOne

lib/logreader.c

@@ -352,18 +352,24 @@ log_reader_update_watches(LogReader *self)
 static inline gboolean
 log_reader_work_in_progress(LogReader *self)
 {
-  return g_atomic_counter_get(&self->io_work_in_progress);
+  main_loop_assert_main_thread();
+
+  return self->io_job.working;
 }
 
 static inline void
 log_reader_set_work_in_progress(LogReader *self, gboolean state)
 {
-  g_atomic_counter_set(&self->io_work_in_progress, state);
+  if ((self->options->flags & LR_THREADED) == 0)
+    {
+      main_loop_assert_main_thread();
+      self->io_job.working = state;
+    }
 }
 
 /* NOTE: See file-reader, file_reader_notify_method() why this is needed */
 inline void
-log_reader_trigger_one_read(LogReader *self)
+log_reader_trigger_one_check(LogReader *self)
 {
   if (FALSE == log_reader_work_in_progress(self))
     log_reader_force_check_in_next_poll(self);
@@ -388,6 +394,8 @@ log_reader_work_finished(void *s, gpointer arg)
 {
   LogReader *self = (LogReader *) s;
 
+  log_reader_set_work_in_progress(self, FALSE);
+
   if (self->pending_close)
     {
       /* pending proto is only set in the main thread, so no need to
@@ -425,8 +433,6 @@ log_reader_work_finished(void *s, gpointer arg)
       log_proto_server_reset_error(self->proto);
       log_reader_update_watches(self);
     }
-
-  log_reader_set_work_in_progress(self, FALSE);
 }
 
 /*****************************************************************************

lib/logreader.h

@@ -79,8 +79,6 @@ struct _LogReader
   guint watches_running:1, suspended:1, realloc_window_after_fetch:1;
   gint notify_code;
 
-  GAtomicCounter io_work_in_progress;
-
   /* proto & poll_events pending to be applied. As long as the previous
    * processing is being done, we can't replace these in self->proto and
    * self->poll_events, they get applied to the production ones as soon as
@@ -100,7 +98,7 @@ void log_reader_set_peer_addr(LogReader *s, GSockAddr *peer_addr);
 void log_reader_set_local_addr(LogReader *s, GSockAddr *local_addr);
 void log_reader_set_immediate_check(LogReader *s);
 void log_reader_disable_bookmark_saving(LogReader *s);
-void log_reader_trigger_one_read(LogReader *s);
+void log_reader_trigger_one_check(LogReader *s);
 gboolean log_reader_is_opened(LogReader *s);
 void log_reader_open(LogReader *s, LogProtoServer *proto, PollEvents *poll_events);
 void log_reader_close_proto(LogReader *s);

modules/affile/file-reader.c

@@ -342,7 +342,7 @@ _on_file_deleted(FileReader *self)
    *       an io-operation in progress!
    */
   if (poll_events_system_polled(self->reader->poll_events))
-    log_reader_trigger_one_read(self->reader);
+    log_reader_trigger_one_check(self->reader);
 }
 
 static void