ctdb-takeover: Fetch public IP addresses from all connected nodes

[samba.git] / ctdb / server / ctdb_statistics.c

diff --git a/ctdb/server/ctdb_statistics.c b/ctdb/server/ctdb_statistics.c
index 502d4df1f9be555573aaaa5458f3da38140b4450..4cf8f9e2726a1aa51a3634ae0057212c1cd72c1c 100644 (file)
--- a/ctdb/server/ctdb_statistics.c
+++ b/ctdb/server/ctdb_statistics.c
@@ -17,12 +17,22 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include <string.h>
-#include "lib/tevent/tevent.h"
-#include "../include/ctdb_private.h"
+#include "replace.h"
+#include "system/network.h"
+#include "system/time.h"
 
-static void ctdb_statistics_update(struct event_context *ev, struct timed_event *te, 
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+
+#include "common/logging.h"
+
+static void ctdb_statistics_update(struct tevent_context *ev,
+                                  struct tevent_timer *te,
                                   struct timeval t, void *p)
 {
        struct ctdb_context *ctdb = talloc_get_type(p, struct ctdb_context);
@@ -35,8 +45,9 @@ static void ctdb_statistics_update(struct event_context *ev, struct timed_event
        bzero(&ctdb->statistics_current, sizeof(struct ctdb_statistics));
        ctdb->statistics_current.statistics_start_time = timeval_current();
 
-       
-       event_add_timed(ctdb->ev, ctdb, timeval_current_ofs(ctdb->tunable.stat_history_interval, 0), ctdb_statistics_update, ctdb);
+       tevent_add_timer(ctdb->ev, ctdb,
+                        timeval_current_ofs(ctdb->tunable.stat_history_interval, 0),
+                        ctdb_statistics_update, ctdb);
 }
 
 int ctdb_statistics_init(struct ctdb_context *ctdb)
@@ -49,19 +60,22 @@ int ctdb_statistics_init(struct ctdb_context *ctdb)
 
        bzero(ctdb->statistics_history, sizeof(ctdb->statistics_history));
 
-       event_add_timed(ctdb->ev, ctdb, timeval_current_ofs(ctdb->tunable.stat_history_interval, 0), ctdb_statistics_update, ctdb);
+       tevent_add_timer(ctdb->ev, ctdb,
+                        timeval_current_ofs(ctdb->tunable.stat_history_interval, 0),
+                        ctdb_statistics_update, ctdb);
        return 0;
 }
 
 
 int32_t ctdb_control_get_stat_history(struct ctdb_context *ctdb, 
-                                     struct ctdb_req_control *c,
+                                     struct ctdb_req_control_old *c,
                                      TDB_DATA *outdata)
 {
        int len;
-       struct ctdb_statistics_wire *s;
+       struct ctdb_statistics_list_old *s;
 
-       len = offsetof(struct ctdb_statistics_wire, stats) + MAX_STAT_HISTORY*sizeof(struct ctdb_statistics);
+       len = offsetof(struct ctdb_statistics_list_old, stats) +
+               MAX_STAT_HISTORY*sizeof(struct ctdb_statistics);
 
        s = talloc_size(outdata, len);
        if (s == NULL) {