update controller code

src/include/xce/cluster_def.h

@@ -26,7 +26,6 @@ enum {
     XCE_CONTROLLER_HOOK_SCHEDULER,
     XCE_CONTROLLER_HOOK_CLUSTER,
     XCE_CONTROLLER_HOOK_RESOURCE,
-    XCE_CONTROLLER_HOOK_CTRL_REQ,
     XCE_CONTROLLER_HOOK_QUEUE,
     XCE_CONTROLLER_HOOK_USERGROUP,
     XCE_CONTROLLER_HOOK_HOSTGROUP,
@@ -46,12 +45,9 @@ enum {
     HOOK_DETAIL_SCHEDULER_JOIN,
     HOOK_DETAIL_SCHEDULER_DEAD,
     HOOK_DETAIL_CLUSTER_INIT,
-    HOOK_DETAIL_DB_INIT,
     HOOK_DETAIL_CLUSTER_SHUTDOWN,
-    HOOK_DETAIL_DB_SHUTDOWN,
     HOOK_DETAIL_RESOURCE_UPDATE,
     HOOK_DETAIL_RESOURCE_LOC_UPDATE,
-    HOOK_DETAIL_CTRL_REQ_FINISH,
     HOOK_DETAIL_QUEUE_UPDATE,
     HOOK_DETAIL_USERGROUP_UPDATE,
     HOOK_DETAIL_HOSTGROUP_UPDATE
@@ -116,27 +112,6 @@ typedef struct {
     endpoint_t* ep;
 } scheduler_t;
 
-typedef struct {
-    DBPool*   db_pool;
-    DBHandle* db_handle;
-    pthread_t fetch_thread;
-    int64_t   fetch_job_pos;
-    int       fetch_job_interval;
-    int       running;
-    mylock_t  db_lock;
-} db_ctx_t;
-
-typedef struct {
-    pthread_t thread;
-    int       runing;
-    int       interval;
-} ctrlreq_ctx_t;
-
-typedef struct {
-    mylock_t      lock;
-    ctrlreq_ctx_t ctrlreq_ctx;
-} ctrl_req_mgr_t;
-
 typedef struct {
     myconf_t*       myconf;
     xce_peerinfo_t* myhost;
@@ -161,8 +136,6 @@ typedef struct {
     vtaskmgr_t      vtaskmgr;
     cbuf_t          wbuf;
     int             running;
-    db_ctx_t        dbctx;
-    ctrl_req_mgr_t  ctrl_req_mgr;
 } cluster_t;
 
 #endif /* XCE_CLUSTER_DEF_H */

src/include/xce/errnox.h

@@ -3,10 +3,10 @@
 #define __XCE_ERRNOX_H__ 1
 
 #include <errno.h>
-#include <string.h>
 #include <stddef.h>
+#include <string.h>
 
-#define XCE_ERRNO_BASE  (10001)
+#define XCE_ERRNO_BASE (10001)
 
 enum {
     E_XCE_BAD_JOB = XCE_ERRNO_BASE,
@@ -21,6 +21,5 @@ enum {
     E_XCE_INTERNAL,
     E_XCE_MAX
 };
-    
 
 #endif