[Cluster-devel] cluster/cman/qdisk disk.h disk_util.c main.c
lhh at sourceware.org
lhh at sourceware.org
Fri Jan 26 14:37:29 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: STABLE
Changes by: lhh at sourceware.org 2007-01-26 14:37:28
Modified files:
cman/qdisk : disk.h disk_util.c main.c
Log message:
Use uptime patch + Patch from Fabio Massimo Di Nitto - Fix portability of getuptime function
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk.h.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3.2.2&r2=1.3.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk_util.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.2.2.1&r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/main.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3.2.2&r2=1.3.2.3
--- cluster/cman/qdisk/disk.h 2007/01/22 23:01:53 1.3.2.2
+++ cluster/cman/qdisk/disk.h 2007/01/26 14:37:27 1.3.2.3
@@ -71,7 +71,8 @@
RF_STOP_CMAN = 0x2,
RF_DEBUG = 0x4,
RF_PARANOID = 0x8,
- RF_ALLOW_KILL = 0x10
+ RF_ALLOW_KILL = 0x10,
+ RF_UPTIME = 0x20
} run_flag_t;
--- cluster/cman/qdisk/disk_util.c 2006/07/21 18:01:38 1.2.2.1
+++ cluster/cman/qdisk/disk_util.c 2007/01/26 14:37:27 1.2.2.2
@@ -37,20 +37,71 @@
#include <time.h>
-static inline void
+inline void
_diff_tv(struct timeval *dest, struct timeval *start, struct timeval *end)
{
- dest->tv_sec = end->tv_sec - start->tv_sec;
- dest->tv_usec = end->tv_usec - start->tv_usec;
+ dest->tv_sec = end->tv_sec - start->tv_sec;
+ dest->tv_usec = end->tv_usec - start->tv_usec;
- if (dest->tv_usec < 0) {
- dest->tv_usec += 1000000;
- dest->tv_sec--;
- }
+ if (dest->tv_usec < 0) {
+ dest->tv_usec += 1000000;
+ dest->tv_sec--;
+ }
}
/**
+ *
+ * Grab the uptime from /proc/uptime.
+ *
+ * @param tv Timeval struct to store time in. The sec
+ * field contains seconds, the usec field
+ * contains the hundredths-of-seconds (converted
+ * to micro-seconds)
+ * @return -1 on failure, 0 on success.
+ */
+static inline int
+getuptime(struct timeval *tv)
+{
+ FILE *fp;
+ struct timeval junk;
+ int rv;
+
+ fp = fopen("/proc/uptime","r");
+ if (!fp)
+ return -1;
+
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+ rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+ &junk.tv_sec, &junk.tv_usec);
+#else
+ rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
+ &junk.tv_sec, &junk.tv_usec);
+#endif
+ fclose(fp);
+
+ if (rv != 4) {
+ return -1;
+ }
+
+ tv->tv_usec *= 10000;
+
+ return 0;
+}
+
+
+inline int
+get_time(struct timeval *tv, int use_uptime)
+{
+ if (use_uptime) {
+ return getuptime(tv);
+ } else {
+ return gettimeofday(tv, NULL);
+ }
+}
+
+
+/**
Update write times and calculate a new average time
*/
void
@@ -147,7 +198,7 @@
ps.ps_arg = 0;
}
- if (gettimeofday(&start, NULL) < 0)
+ if (get_time(&start, ctx->qc_flags&RF_UPTIME) < 0)
utime_ok = 0;
swab_status_block_t(&ps);
if (qdisk_write(ctx->qc_fd, qdisk_nodeid_offset(nid), &ps,
@@ -155,7 +206,7 @@
printf("Error writing node ID block %d\n", nid);
return -1;
}
- if (utime_ok && (gettimeofday(&end, NULL) < 0))
+ if (utime_ok && (get_time(&end, ctx->qc_flags&RF_UPTIME) < 0))
utime_ok = 0;
if (utime_ok) {
--- cluster/cman/qdisk/main.c 2007/01/22 23:01:53 1.3.2.2
+++ cluster/cman/qdisk/main.c 2007/01/26 14:37:28 1.3.2.3
@@ -62,6 +62,10 @@
int clear_bit(uint8_t *mask, uint32_t bitidx, uint32_t masklen);
int set_bit(uint8_t *mask, uint32_t bitidx, uint32_t masklen);
int is_bit_set(uint8_t *mask, uint32_t bitidx, uint32_t masklen);
+inline int get_time(struct timeval *tv, int use_uptime);
+inline void _diff_tv(struct timeval *dest, struct timeval *start,
+ struct timeval *end);
+
static int _running = 0;
@@ -711,18 +715,6 @@
}
-static inline void
-_diff_tv(struct timeval *dest, struct timeval *start, struct timeval *end)
-{
- dest->tv_sec = end->tv_sec - start->tv_sec;
- dest->tv_usec = end->tv_usec - start->tv_usec;
-
- if (dest->tv_usec < 0) {
- dest->tv_usec += 1000000;
- dest->tv_sec--;
- }
-}
-
#define _print_tv(val) \
printf("%s: %d.%06d\n", #val, (int)((val)->tv_sec), \
@@ -821,7 +813,7 @@
_running = 1;
while (_running) {
/* XXX this was getuptime() in clumanager */
- gettimeofday(&oldtime, NULL);
+ get_time(&oldtime, (ctx->qc_flags&RF_UPTIME));
/* Read everyone else's status */
read_node_blocks(ctx, ni, max);
@@ -985,7 +977,7 @@
/* Cycle. We could time the loop and sleep
usleep(interval-looptime), but this is fine for now.*/
- gettimeofday(&newtime, NULL);
+ get_time(&newtime, ctx->qc_flags&RF_UPTIME);
_diff_tv(&diff, &oldtime, &newtime);
/*
@@ -1066,7 +1058,8 @@
ctx->qc_interval = 1;
ctx->qc_tko = 10;
ctx->qc_scoremin = 0;
- ctx->qc_flags = RF_REBOOT | RF_ALLOW_KILL; /* | RF_STOP_CMAN;*/
+ ctx->qc_flags = RF_REBOOT | RF_ALLOW_KILL | RF_UPTIME;
+ /* | RF_STOP_CMAN;*/
ctx->qc_sched = SCHED_RR;
ctx->qc_sched_prio = 1;
@@ -1228,6 +1221,20 @@
free(val);
}
+ /*
+ * Get flag to see if we're supposed to use /proc/uptime instead of
+ * gettimeofday(2)
+ */
+ /* default = off, so, 1 to turn on */
+ snprintf(query, sizeof(query), "/cluster/quorumd/@use_uptime");
+ if (ccs_get(ccsfd, query, &val) == 0) {
+ if (!atoi(val))
+ ctx->qc_flags &= ~RF_UPTIME;
+ else
+ ctx->qc_flags |= RF_UPTIME;
+ free(val);
+ }
+
*cfh = configure_heuristics(ccsfd, h, maxh);
clulog(LOG_DEBUG,
More information about the Cluster-devel
mailing list