Support backward compatibility by checking for __pmID_int type, which
was previously in <pcp/impl.h>. In the new version, this type is not
defined anymore and there is no need to include <pcp/impl.h>.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Mar 2 00:38:52 CET 2018 on sn-devel-144
#include "client/client_sync.h"
#include <pcp/pmapi.h>
#include "client/client_sync.h"
#include <pcp/pmapi.h>
+#ifdef HAVE___PMID_INT
+#include <pcp/impl.h>
+
+#define pmID_cluster(id) id->cluster
+#define pmID_item(id) id->item
+#define pmGetProgname() pmProgname
+#define pmSetProgname(a) __pmSetProgname(a)
+#endif
+
pmda_ctdb_fetch_cb(pmdaMetric *mdesc, unsigned int inst, pmAtomValue *atom)
{
int ret;
pmda_ctdb_fetch_cb(pmdaMetric *mdesc, unsigned int inst, pmAtomValue *atom)
{
int ret;
__pmID_int *id = (__pmID_int *)&(mdesc->m_desc.pmid);
__pmID_int *id = (__pmID_int *)&(mdesc->m_desc.pmid);
+#else
+ pmID id = *(pmID *)&(mdesc->m_desc.pmid);
+#endif
if (inst != PM_IN_NULL) {
return PM_ERR_INST;
if (inst != PM_IN_NULL) {
return PM_ERR_INST;
+ switch (pmID_cluster(id)) {
- ret = fill_base(id->item, atom);
+ ret = fill_base(pmID_item(id), atom);
if (ret) {
goto err_out;
}
break;
case 1:
if (ret) {
goto err_out;
}
break;
case 1:
- ret = fill_node(id->item, atom);
+ ret = fill_node(pmID_item(id), atom);
if (ret) {
goto err_out;
}
break;
case 2:
if (ret) {
goto err_out;
}
break;
case 2:
- ret = fill_client(id->item, atom);
+ ret = fill_client(pmID_item(id), atom);
if (ret) {
goto err_out;
}
break;
case 3:
if (ret) {
goto err_out;
}
break;
case 3:
- ret = fill_timeout(id->item, atom);
+ ret = fill_timeout(pmID_item(id), atom);
if (ret) {
goto err_out;
}
if (ret) {
goto err_out;
}
static void
usage(void)
{
static void
usage(void)
{
- fprintf(stderr, "Usage: %s [options]\n\n", pmProgname);
+ fprintf(stderr, "Usage: %s [options]\n\n", pmGetProgname());
fputs("Options:\n"
" -d domain use domain (numeric) for metrics domain of PMDA\n"
" -l logfile write log into logfile rather than using default log name\n"
fputs("Options:\n"
" -d domain use domain (numeric) for metrics domain of PMDA\n"
" -l logfile write log into logfile rather than using default log name\n"
char log_file[] = "pmda_ctdb.log";
pmdaInterface dispatch;
char log_file[] = "pmda_ctdb.log";
pmdaInterface dispatch;
- __pmSetProgname(argv[0]);
+ pmSetProgname(argv[0]);
- pmdaDaemon(&dispatch, PMDA_INTERFACE_2, pmProgname, CTDB,
+ pmdaDaemon(&dispatch, PMDA_INTERFACE_2, argv[0], CTDB,
log_file, helpfile());
if (pmdaGetOpt(argc, argv, "d:i:l:pu:?", &dispatch, &err) != EOF) {
log_file, helpfile());
if (pmdaGetOpt(argc, argv, "d:i:l:pu:?", &dispatch, &err) != EOF) {
if not conf.CHECK_FUNCS_IN('pmdaDaemon', 'pcp_pmda'):
pmda_support = False
if pmda_support:
if not conf.CHECK_FUNCS_IN('pmdaDaemon', 'pcp_pmda'):
pmda_support = False
if pmda_support:
+ conf.CHECK_TYPE_IN('__pmID_int', 'pcp/pmapi.h pcp/impl.h')
have_pmda = True
else:
Logs.error("PMDA support not available")
have_pmda = True
else:
Logs.error("PMDA support not available")