diff options
| author | Kotresh HR <khiremat@redhat.com> | 2015-07-01 12:06:42 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-07-02 06:16:34 -0700 |
| commit | 2f5355f76a8168bc504cba8237f0825fc181fce8 (patch) | |
| tree | dc4ec955962624138102e9a2a41ec7cdd1074963 | |
| parent | 8def0f28c908224359a04ec2f658a3ba241c7249 (diff) | |
libgfchangelog: Fix example programs
Incorporate the new API 'gf_changelog_init'
introduced in libgfchangelog which should
be called before 'gf_changelog_register'.
Change-Id: I10a9dd5ff3ecc64fd61dcb6b1aa53739e0bdeedd
BUG: 1238063
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/11479
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
4 files changed, 21 insertions, 2 deletions
diff --git a/xlators/features/changelog/lib/examples/c/get-changes.c b/xlators/features/changelog/lib/examples/c/get-changes.c index 0b2808c7e35..ef766c566b6 100644 --- a/xlators/features/changelog/lib/examples/c/get-changes.c +++ b/xlators/features/changelog/lib/examples/c/get-changes.c @@ -39,6 +39,12 @@ main (int argc, char ** argv) ssize_t changes = 0; char fbuf[PATH_MAX] = {0,}; + ret = gf_changelog_init (NULL); + if (ret) { + handle_error ("Init failed"); + goto out; + } + /* get changes for brick "/home/vshankar/export/yow/yow-1" */ ret = gf_changelog_register ("/export/z1/zwoop", "/tmp/scratch", "/tmp/change.log", 9, 5); diff --git a/xlators/features/changelog/lib/examples/c/get-history.c b/xlators/features/changelog/lib/examples/c/get-history.c index 2e1ff3c767f..ee3ec0ad100 100644 --- a/xlators/features/changelog/lib/examples/c/get-history.c +++ b/xlators/features/changelog/lib/examples/c/get-history.c @@ -40,6 +40,12 @@ main (int argc, char ** argv) char fbuf[PATH_MAX] = {0,}; unsigned long end_ts = 0; + ret = gf_changelog_init (NULL); + if (ret) { + handle_error ("init failed"); + goto out; + } + ret = gf_changelog_register ("/export/z1/zwoop", "/tmp/scratch_v1", "/tmp/changes.log", 9, 5); diff --git a/xlators/features/changelog/lib/examples/python/changes.py b/xlators/features/changelog/lib/examples/python/changes.py index d21db8eab2e..221df642a36 100644 --- a/xlators/features/changelog/lib/examples/python/changes.py +++ b/xlators/features/changelog/lib/examples/python/changes.py @@ -10,6 +10,7 @@ cl = libgfchangelog.Changes() def get_changes(brick, scratch_dir, log_file, log_level, interval): change_list = [] try: + cl.cl_init() cl.cl_register(brick, scratch_dir, log_file, log_level) while True: cl.cl_scan() @@ -25,7 +26,7 @@ def get_changes(brick, scratch_dir, log_file, log_level, interval): print ex if __name__ == '__main__': - if len(sys.argv) != 5: + if len(sys.argv) != 6: print("usage: %s <brick> <scratch-dir> <log-file> <fetch-interval>" % (sys.argv[0])) sys.exit(1) diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py index 68ec3baf144..10e73c02b34 100644 --- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py +++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py @@ -3,7 +3,7 @@ from ctypes import * from ctypes.util import find_library class Changes(object): - libgfc = CDLL(find_library("gfchangelog"), use_errno=True) + libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) @classmethod def geterrno(cls): @@ -19,6 +19,12 @@ class Changes(object): return getattr(cls.libgfc, call) @classmethod + def cl_init(cls): + ret = cls._get_api('gf_changelog_init')(None) + if ret == -1: + cls.raise_changelog_err() + + @classmethod def cl_register(cls, brick, path, log_file, log_level, retries = 0): ret = cls._get_api('gf_changelog_register')(brick, path, log_file, log_level, retries) |