Put the hm_slot_server_t in a common include.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798507 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/heartbeat.h b/include/heartbeat.h
new file mode 100644 (file)
index 0000000..8d897bb
--- /dev/null
+++ b/include/heartbeat.h
@@ -0,0 +1,51 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef HEARTBEAT_H
+#define HEARTBEAT_H
+
+/**
+ * @file  heartbeat.h
+ * @brief commun structures for mod_heartmonitor.c  and mod_lbmethod_heartbeat.c
+ *
+ * @defgroup HEARTBEAT mem
+ * @ingroup  APACHE_MODS
+ * @{
+ */
+
+#include "apr.h"
+#include "apr_time.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAXIPSIZE  64
+typedef struct hm_slot_server_t
+{
+    char ip[MAXIPSIZE];
+    int busy;
+    int ready;
+    apr_time_t seen;
+    int id;
+} hm_slot_server_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/** @} */

diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 0b42baa33d30937dbfb405737160cd2a1f816ab9..41137bf08512869daab298a76e4e6481bb738005 100644 (file)
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -26,6 +26,7 @@
 #include "scoreboard.h"
 #include "mod_watchdog.h"
 #include "ap_slotmem.h"
+#include "heartbeat.h"
 
 
 #ifndef HM_UPDATE_SEC
@@ -36,8 +37,6 @@
 
 #define HM_WATHCHDOG_NAME ("_heartmonitor_")
 
-#define MAXIPSIZE  64
-
 const ap_slotmem_provider_t *storage = NULL;
 static ap_slotmem_instance_t *slotmem = NULL;
 static int maxworkers = 0;
@@ -52,15 +51,6 @@ typedef struct hm_server_t
     apr_time_t seen;
 } hm_server_t;
 
-typedef struct hm_slot_server_t
-{
-    char ip[MAXIPSIZE];
-    int busy;
-    int ready;
-    apr_time_t seen;
-    int id;
-} hm_slot_server_t;
-
 typedef struct hm_ctx_t
 {
     int active;

diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index a04e5aaa71f29c8f4a0941a5ae7eb815cc8903ad..dd2fbf8a5b361d1f0a6fd77b3cbe7fa7cb1df504 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -20,6 +20,7 @@
 #include "apr_version.h"
 #include "apr_hooks.h"
 #include "ap_slotmem.h"
+#include "heartbeat.h"
 
 #ifndef LBM_HEARTBEAT_MAX_LASTSEEN
 /* If we haven't seen a heartbeat in the last N seconds, don't count this IP
@@ -51,16 +52,6 @@ typedef struct hb_server_t {
     proxy_worker *worker;
 } hb_server_t;
 
-#define MAXIPSIZE  64
-typedef struct hm_slot_server_t
-{
-    char ip[MAXIPSIZE];
-    int busy;
-    int ready;
-    apr_time_t seen;
-    int id;
-} hm_slot_server_t;
-
 static void
 argstr_to_table(apr_pool_t *p, char *str, apr_table_t *parms)
 {