Improvements to the C++ API

Author: johnbellardo

events.h

@@ -473,6 +473,12 @@ class EventManager
       EventManager(struct EventState *state) : ctx(state),
             free_state(false) {}
       virtual ~EventManager() { if (free_state) EVT_free_handler(ctx); }
+      void state(struct EventState *state, bool frees = false) {
+         if (free_state && ctx)
+            EVT_free_handler(ctx);
+         free_state = frees;
+         ctx = state;
+      }
 
       int EventLoop() { return EVT_start_loop(ctx); }
       void Exit() { EVT_exit_loop(ctx); }
@@ -482,7 +488,8 @@ class EventManager
       void RemoveWriteEvent(int fd) { RemoveEvent(fd, EVENT_FD_WRITE); }
       void RemoveErrorEvent(int fd) { RemoveEvent(fd, EVENT_FD_ERROR); }
 
-      struct EventState *state() { return ctx; }
+      EVTHandler *state() { return ctx; }
+      operator EVTHandler*() { return ctx; }
 
       void AddEvent(int fd, EVT_fd_cb cb, void *p, int event,
             EVT_fd_cb cleanup = NULL)

proclib.h

@@ -476,25 +476,27 @@ class Process
       Process(const char *name, enum WatchdogMode wdMode) : events(NULL)
          { process = PROC_init(name, wdMode); }
       virtual ~Process() {
-         delete events;
          if (process)
             PROC_cleanup(process);
       }
-      EventManager *event_manager() {
-         if (!events)
-            events = new EventManager(PROC_evt(process));
+      EventManager &event_manager() {
+         if (!events.state())
+            events.state(PROC_evt(process));
          return events;
       }
 
       int AddSignalEvent(int sigNum, PROC_signal_cb cb, void *p)
          { return PROC_signal(process, sigNum, cb, p); }
 
+      operator EVTHandler*() { return event_manager().state(); }
+      operator ProcessData*() { return process; }
+
       ProcessData *getProcessData(void) { return process; }
 
    private:
       Process() { process = NULL; }
       ProcessData *process;
-      EventManager *events;
+      EventManager events;
 };
 
 #endif