fix(clib): clib headers synchronized

bouda1 · bouda1 · commit a38a0bb0f2cf · 2021-10-13T18:37:27.000+02:00
diff --git a/neb/inc/com/centreon/exceptions/basic.hh b/neb/inc/com/centreon/exceptions/basic.hh
@@ -50,7 +50,7 @@ class basic : public std::exception {
 
   misc::stringifier _buffer;
 };
-}
+}  // namespace exceptions
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/exceptions/interruption.hh b/neb/inc/com/centreon/exceptions/interruption.hh
@@ -47,7 +47,7 @@ class interruption : public basic {
     return (*this);
   }
 };
-}
+}  // namespace exceptions
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/io/directory_entry.hh b/neb/inc/com/centreon/io/directory_entry.hh
@@ -21,8 +21,8 @@
 
 #include <list>
 #include <string>
-#include "com/centreon/io/file_entry.hh"
 #include "com/centreon/handle.hh"
+#include "com/centreon/io/file_entry.hh"
 #include "com/centreon/namespace.hh"
 
 CC_BEGIN()
@@ -55,7 +55,7 @@ class directory_entry {
   file_entry _entry;
   std::list<file_entry> _entry_lst;
 };
-}
+}  // namespace io
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/io/file_entry.hh b/neb/inc/com/centreon/io/file_entry.hh
@@ -19,9 +19,9 @@
 #ifndef CC_IO_FILE_ENTRY_HH
 #define CC_IO_FILE_ENTRY_HH
 
-#include <string>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <string>
 #include "com/centreon/handle.hh"
 #include "com/centreon/namespace.hh"
 
@@ -65,7 +65,7 @@ class file_entry {
   std::string _path;
   struct stat _sbuf;
 };
-}
+}  // namespace io
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/io/file_stream.hh b/neb/inc/com/centreon/io/file_stream.hh
@@ -63,7 +63,7 @@ class file_stream : public handle {
   bool _auto_close;
   FILE* _stream;
 };
-}
+}  // namespace io
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/logging/backend.hh b/neb/inc/com/centreon/logging/backend.hh
@@ -29,12 +29,7 @@ class stringifier;
 }
 
 namespace logging {
-enum time_precision {
-  none = 0,
-  microsecond = 1,
-  millisecond = 2,
-  second = 3
-};
+enum time_precision { none = 0, microsecond = 1, millisecond = 2, second = 3 };
 
 /**
  *  @class backend backend.hh "com/centreon/logging/backend.hh"
@@ -81,7 +76,7 @@ class backend {
  protected:
   void _internal_copy(backend const& right);
 };
-}
+}  // namespace logging
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/logging/engine.hh b/neb/inc/com/centreon/logging/engine.hh
@@ -89,7 +89,7 @@ class engine {
   unsigned long long _list_types[sizeof(unsigned int) * CHAR_BIT];
   mutable std::mutex _mtx;
 };
-}
+}  // namespace logging
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/logging/file.hh b/neb/inc/com/centreon/logging/file.hh
@@ -68,7 +68,7 @@ class file : public backend {
   FILE* _out;
   uint64_t _size;
 };
-}
+}  // namespace logging
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/logging/logger.hh b/neb/inc/com/centreon/logging/logger.hh
@@ -30,20 +30,16 @@ enum type_value {
   type_error = (1ull << 63)
 };
 
-enum verbosity_level {
-  low = 0,
-  medium = 1,
-  high = 2
-};
-}
+enum verbosity_level { low = 0, medium = 1, high = 2 };
+}  // namespace logging
 
 CC_END()
 
 #define log_info(verbose)                                                \
   for (unsigned int __com_centreon_logging_define_ui(0);                 \
        !__com_centreon_logging_define_ui &&                              \
-           com::centreon::logging::engine::instance().is_log(            \
-               com::centreon::logging::type_info, verbose);              \
+       com::centreon::logging::engine::instance().is_log(                \
+           com::centreon::logging::type_info, verbose);                  \
        ++__com_centreon_logging_define_ui)                               \
   com::centreon::logging::temp_logger(com::centreon::logging::type_info, \
                                       verbose)                           \
@@ -52,8 +48,8 @@ CC_END()
 #define log_debug(verbose)                                                \
   for (unsigned int __com_centreon_logging_define_ui(0);                  \
        !__com_centreon_logging_define_ui &&                               \
-           com::centreon::logging::engine::instance().is_log(             \
-               com::centreon::logging::type_debug, verbose);              \
+       com::centreon::logging::engine::instance().is_log(                 \
+           com::centreon::logging::type_debug, verbose);                  \
        ++__com_centreon_logging_define_ui)                                \
   com::centreon::logging::temp_logger(com::centreon::logging::type_debug, \
                                       verbose)                            \
@@ -62,8 +58,8 @@ CC_END()
 #define log_error(verbose)                                                \
   for (unsigned int __com_centreon_logging_define_ui(0);                  \
        !__com_centreon_logging_define_ui &&                               \
-           com::centreon::logging::engine::instance().is_log(             \
-               com::centreon::logging::type_error, verbose);              \
+       com::centreon::logging::engine::instance().is_log(                 \
+           com::centreon::logging::type_error, verbose);                  \
        ++__com_centreon_logging_define_ui)                                \
   com::centreon::logging::temp_logger(com::centreon::logging::type_error, \
                                       verbose)                            \
diff --git a/neb/inc/com/centreon/logging/syslogger.hh b/neb/inc/com/centreon/logging/syslogger.hh
@@ -54,7 +54,7 @@ class syslogger : public backend {
   int _facility;
   std::string _id;
 };
-}
+}  // namespace logging
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/logging/temp_logger.hh b/neb/inc/com/centreon/logging/temp_logger.hh
@@ -21,8 +21,8 @@
 
 #include <string>
 #include "com/centreon/logging/engine.hh"
-#include "com/centreon/namespace.hh"
 #include "com/centreon/misc/stringifier.hh"
+#include "com/centreon/namespace.hh"
 
 CC_BEGIN()
 
@@ -59,7 +59,7 @@ class temp_logger {
   unsigned long long _type;
   unsigned int _verbose;
 };
-}
+}  // namespace logging
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/misc/argument.hh b/neb/inc/com/centreon/misc/argument.hh
@@ -67,7 +67,7 @@ class argument {
   char _name;
   std::string _value;
 };
-}
+}  // namespace misc
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/misc/command_line.hh b/neb/inc/com/centreon/misc/command_line.hh
@@ -55,7 +55,7 @@ class command_line {
   char** _argv;
   size_t _size;
 };
-}
+}  // namespace misc
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/misc/get_options.hh b/neb/inc/com/centreon/misc/get_options.hh
@@ -22,8 +22,8 @@
 #include <map>
 #include <string>
 #include <vector>
-#include "com/centreon/namespace.hh"
 #include "com/centreon/misc/argument.hh"
+#include "com/centreon/namespace.hh"
 
 CC_BEGIN()
 
@@ -74,7 +74,7 @@ class get_options {
                            std::string& key,
                            std::string& value);
 };
-}
+}  // namespace misc
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/misc/stringifier.hh b/neb/inc/com/centreon/misc/stringifier.hh
@@ -75,7 +75,7 @@ class stringifier {
   static unsigned int const _static_buffer_size = 1024;
   char _static_buffer[_static_buffer_size];
 };
-}
+}  // namespace misc
 
 CC_END()
 
diff --git a/neb/inc/com/centreon/process.hh b/neb/inc/com/centreon/process.hh
@@ -20,7 +20,10 @@
 #define CC_PROCESS_POSIX_HH
 
 #include <sys/types.h>
+#include <array>
+#include <atomic>
 #include <condition_variable>
+#include <csignal>
 #include <mutex>
 #include <string>
 #include "com/centreon/timestamp.hh"
@@ -39,27 +42,50 @@ class process_manager;
 class process {
   friend class process_manager;
 
+  /* Constants */
+  const std::array<bool, 3> _enable_stream;
+  process_listener* const _listener;
+
+  /* Constants except during exec() call */
+  uint32_t _timeout;
+
+  /* Constants except when they are initialized at exec() and closed when
+   * process is over. */
+  std::atomic_bool _is_timeout;
+  std::atomic_int _status;
+  std::array<int, 3> _stream;
+  pid_t _process;
+
+  /* Almost never changed, we have two such functions, one with pgid and the
+   * other without. */
+  pid_t (*_create_process)(char**, char**);
+
  public:
   enum status { normal = 0, crash = 1, timeout = 2 };
   enum stream { in = 0, out = 1, err = 2 };
 
  private:
+  /* Error buffer:
+   * * cleared by exec(),
+   * * content get and then cleared by read_err()
+   * * and filled by do_read() when an error in the process occures. This last
+   *   method is called by the process manager in its main loop when needed.
+   */
   std::string _buffer_err;
+
+  /* Output buffer:
+   * * cleared by exec(),
+   * * content get and then cleared by read()
+   * * and filled by do_read() when an output in the process occures. This last
+   *   method is called by the process manager in its main loop when needed.
+   */
   std::string _buffer_out;
-  pid_t (*_create_process)(char**, char**);
   mutable std::condition_variable _cv_buffer_err;
   mutable std::condition_variable _cv_buffer_out;
   mutable std::condition_variable _cv_process_running;
-  const std::array<bool, 3> _enable_stream;
-  std::array<int, 3> _stream;
   timestamp _end_time;
-  bool _is_timeout;
-  process_listener* _listener;
   mutable std::mutex _lock_process;
-  pid_t _process;
   timestamp _start_time;
-  int _status;
-  uint32_t _timeout;
 
   static void _close(int& fd) noexcept;
   static pid_t _create_process_with_setpgid(char** args, char** env);
@@ -88,7 +114,7 @@ class process {
   void exec(std::string const& cmd, uint32_t timeout = 0);
   int exit_code() const noexcept;
   status exit_status() const noexcept;
-  void kill();
+  void kill(int sig = SIGKILL);
   void read(std::string& data);
   void read_err(std::string& data);
   void setpgid_on_exec(bool enable) noexcept;
@@ -97,9 +123,10 @@ class process {
   void terminate();
   void wait() const;
   bool wait(uint32_t timeout) const;
-  void update_ending_process(int status);
   uint32_t write(std::string const& data);
   uint32_t write(void const* data, uint32_t size);
+  void update_ending_process(int status);
+  void set_timeout(bool timeout);
 };
 
 CC_END()
diff --git a/neb/inc/com/centreon/process_manager.hh b/neb/inc/com/centreon/process_manager.hh

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class interruption : public basic {`
`47`	`47`	`return (*this);`
`48`	`48`	`}`
`49`	`49`	`};`
`50`		`-}`
	`50`	`+} // namespace exceptions`
`51`	`51`
`52`	`52`	`CC_END()`
`53`	`53`