diff options
| author | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2009-02-27 20:25:36 +0000 |
|---|---|---|
| committer | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2009-02-27 20:25:36 +0000 |
| commit | 8044128fa6322f391d4629072954e24ef1c72e4f (patch) | |
| tree | 00b99f9a142c379d3bf63620c8a98753cbe82172 | |
| parent | ca75be6fc18f04a2bfac1441bc82d970832d66ea (diff) | |
| download | libcg-8044128fa6322f391d4629072954e24ef1c72e4f.tar.gz libcg-8044128fa6322f391d4629072954e24ef1c72e4f.tar.xz libcg-8044128fa6322f391d4629072954e24ef1c72e4f.zip | |
libcgroup test: Change dbg to cgroup_dbg
Since cgroup_dbg is defined on the basis of CGROUP_DBG, we get
libcgrouptest.h and libcg_ba.cpp to include config.h and change
dbg to cgroup_dbg.
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Sudhir Kumar <skumar@linux.vnet.ibm.com>
git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@354 4f4bb910-9a46-0410-90c8-c897d4f1cd53
| -rw-r--r-- | tests/libcg_ba.cpp | 10 | ||||
| -rw-r--r-- | tests/libcgrouptest.h | 7 | ||||
| -rw-r--r-- | tests/libcgrouptest01.c | 9 |
3 files changed, 21 insertions, 5 deletions
diff --git a/tests/libcg_ba.cpp b/tests/libcg_ba.cpp index 6d402b6..c9994d6 100644 --- a/tests/libcg_ba.cpp +++ b/tests/libcg_ba.cpp @@ -25,6 +25,14 @@ using namespace std; #include <stdlib.h> #include <string.h> +#include "../config.h" + +#ifdef CGROUP_DBG +#define cgroup_dbg(p...) printf(p...) +#else +#define cgroup_dbg(p...) do {} while (0) +#endif + namespace cgtest { class cg { @@ -83,7 +91,7 @@ struct cgroup *cg::makenode(const string &name, const string &task_uid, return NULL; cgid = grp->gr_gid; - dbg("tuid %d, tgid %d, cuid %d, cgid %d\n", tuid, tgid, cuid, cgid); + cgroup_dbg("tuid %d, tgid %d, cuid %d, cgid %d\n", tuid, tgid, cuid, cgid); cgroup_name = (char *) malloc(name.length()); strncpy(cgroup_name, name.c_str(), name.length() + 1); diff --git a/tests/libcgrouptest.h b/tests/libcgrouptest.h index a0f82d6..3c04b6a 100644 --- a/tests/libcgrouptest.h +++ b/tests/libcgrouptest.h @@ -28,6 +28,7 @@ #include <sys/types.h> #include <libcgroup.h> +#include "../config.h" #define SIZE 100 /* Max size of a message to be printed */ #define NUM_MSGS 20 /* Number of such messsages */ @@ -146,4 +147,10 @@ void build_path(char *target, char *mountpoint, const char *group, const char *file); pid_t cgrouptest_gettid(); +#ifdef CGROUP_DEBUG +#define cgroup_dbg(p...) printf(p...) +#else +#define cgroup_dbg(p...) do {} while (0); +#endif + #endif diff --git a/tests/libcgrouptest01.c b/tests/libcgrouptest01.c index d489d9c..acc229a 100644 --- a/tests/libcgrouptest01.c +++ b/tests/libcgrouptest01.c @@ -54,18 +54,19 @@ int main(int argc, char *argv[]) exit(1); } fs_mounted = atoi(argv[1]); - dbg("C:DBG: fs_mounted as recieved from script=%d\n", fs_mounted); + cgroup_dbg("C:DBG: fs_mounted as recieved from script=%d\n", + fs_mounted); /* All possible controller will be element of an enum */ if (fs_mounted) { ctl1 = atoi(argv[2]); ctl2 = atoi(argv[3]); strncpy(mountpoint, argv[4], sizeof(mountpoint)); - dbg("C:DBG: mountpoint1 as recieved from script=%s\n", + cgroup_dbg("C:DBG: mountpoint1 as recieved from script=%s\n", mountpoint); if (fs_mounted == FS_MULTI_MOUNTED) { strncpy(mountpoint2, argv[5], sizeof(mountpoint2)); - dbg("C:DBG: mountpoint2 as recieved from script=%s\n", - mountpoint2); + cgroup_dbg("C:DBG: mountpoint2 as recieved from " + "script=%s\n", mountpoint2); } } |