Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 907982 Details for
Bug 1108511
Corosync mon service contains various problems
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
mon: Make mon compilable with libstatgrab ver 0.9
tmp.nkp0aGsmto (text/plain), 2.15 KB, created by
Jan Friesse
on 2014-06-12 07:34:34 UTC
(
hide
)
Description:
mon: Make mon compilable with libstatgrab ver 0.9
Filename:
MIME Type:
Creator:
Jan Friesse
Created:
2014-06-12 07:34:34 UTC
Size:
2.15 KB
patch
obsolete
>From e1e2390b61fb5d47a8639f2538721675dd411b08 Mon Sep 17 00:00:00 2001 >From: Jan Friesse <jfriesse@redhat.com> >Date: Mon, 24 Feb 2014 16:03:45 +0100 >Subject: [PATCH] mon: Make mon compilable with libstatgrab ver 0.9 > >Signed-off-by: Jan Friesse <jfriesse@redhat.com> >Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> >--- > configure.ac | 3 +++ > exec/mon.c | 14 ++++++++++++++ > 2 files changed, 17 insertions(+), 0 deletions(-) > >diff --git a/configure.ac b/configure.ac >index 523d2cf..4f374fc 100644 >--- a/configure.ac >+++ b/configure.ac >@@ -428,6 +428,9 @@ fi > > if test "x${enable_monitoring}" = xyes; then > PKG_CHECK_MODULES([statgrab], [libstatgrab]) >+ PKG_CHECK_MODULES([statgrabge090], [libstatgrab >= 0.90], >+ AC_DEFINE_UNQUOTED([HAVE_LIBSTATGRAB_GE_090], 1, [have libstatgrab >= 0.90]), >+ TMP_VARIABLE=1) > AC_DEFINE_UNQUOTED([HAVE_MONITORING], 1, [have resource monitoring]) > PACKAGE_FEATURES="$PACKAGE_FEATURES monitoring" > WITH_LIST="$WITH_LIST --with monitoring" >diff --git a/exec/mon.c b/exec/mon.c >index 49c46b4..ab16a47 100644 >--- a/exec/mon.c >+++ b/exec/mon.c >@@ -307,8 +307,13 @@ static int32_t percent_mem_used_get(void) > sg_swap_stats *swap_stats; > long long total, freemem; > >+#ifdef HAVE_LIBSTATGRAB_GE_090 >+ mem_stats = sg_get_mem_stats(NULL); >+ swap_stats = sg_get_swap_stats(NULL); >+#else > mem_stats = sg_get_mem_stats(); > swap_stats = sg_get_swap_stats(); >+#endif > > if (mem_stats == NULL || swap_stats != NULL) { > log_printf (LOGSYS_LEVEL_ERROR, "Unable to get memory stats: %s", >@@ -348,7 +353,12 @@ static void mem_update_stats_fn (void *data) > static double min15_loadavg_get(void) > { > sg_load_stats *load_stats; >+ >+#ifdef HAVE_LIBSTATGRAB_GE_090 >+ load_stats = sg_get_load_stats (NULL); >+#else > load_stats = sg_get_load_stats (); >+#endif > if (load_stats == NULL) { > log_printf (LOGSYS_LEVEL_ERROR, "Unable to get load stats: %s", > sg_str_error (sg_get_error())); >@@ -463,7 +473,11 @@ static void mon_instance_init (struct resource_instance* inst) > > static char *mon_exec_init_fn (struct corosync_api_v1 *corosync_api) > { >+#ifdef HAVE_LIBSTATGRAB_GE_090 >+ sg_init(1); >+#else > sg_init(); >+#endif > > api = corosync_api; > >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1108511
: 907982 |
907983
|
907984
|
907985