Menu
▾
▴
[Omc-commit] SF.net SVN: omc:[1113] contrib/xen-vm-builder/trunk
|
From: <jc...@us...> - 2008-10-19 20:57:37
|
Revision: 1113
http://omc.svn.sourceforge.net/omc/?rev=1113&view=rev
Author: jcarey
Date: 2008-10-19 20:57:27 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Added code to print debug trace message if the VM_BUILDER_DEBUG environment variable is set. Even if not built for debug
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/configure.ac
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/owning-job.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/setting-define-build.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
Modified: contrib/xen-vm-builder/trunk/configure.ac
===================================================================
--- contrib/xen-vm-builder/trunk/configure.ac 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/configure.ac 2008-10-19 20:57:27 UTC (rev 1113)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(sblim-cmpi-xenvm-builder, 1.0.2)
+AC_INIT(sblim-cmpi-xenvm-builder, 1.0.3)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADER([config.h])
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c 2008-10-19 20:57:27 UTC (rev 1113)
@@ -157,7 +157,7 @@
memset(pinfo, 0, sizeof(*pinfo));
if (cmpiutilExecuteProcessAndGatherOutputAndError((char* const*)cmd, NULL, &output,
&output_size, -1, NULL, NULL, -1, NULL, &status, -1) == 0) {
- //DEBUGOUT("vm-install-jobs -s returned %d - %s\n", status, output);
+ DEBUGOUT("vm-install-jobs -s returned %d - %s\n", status, output);
unsigned int num_elements;
lines = cmpiutilStrTokenize(output, "\r\n", &num_elements);
if (lines) {
@@ -739,11 +739,10 @@
Init(
CMPIInstanceMI* self)
{
+ set_debug_for_env();
DEBUGOUT("Initialize() called\n");
-
DEBUGOUT("Deleting job xref recs that no longer exist\n");
db_delete_dead_job_recs(NULL);
-
DEBUGOUT("Leaving Initialize()\n");
}
@@ -775,6 +774,7 @@
MethodInit(
CMPIMethodMI * self)
{
+ set_debug_for_env();
DEBUGOUT("MethodInitialize() called\n");
// do work here if necessary
@@ -916,6 +916,7 @@
AssocInit(
CMPIAssociationMI* self)
{
+ set_debug_for_env();
DEBUGOUT("AssocInit() called");
DEBUGOUT("Leaving AssocInit()\n");
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-10-19 20:57:27 UTC (rev 1113)
@@ -527,6 +527,7 @@
Init(
CMPIInstanceMI* self)
{
+ set_debug_for_env();
DEBUGOUT("Initialize() called\n");
DEBUGOUT("Leaving Initialize()\n");
@@ -560,6 +561,7 @@
MethodInit(
CMPIMethodMI * self)
{
+ set_debug_for_env();
DEBUGOUT("MethodInitialize() called\n");
// do work here if necessary
@@ -1168,6 +1170,7 @@
AssocInit(
CMPIAssociationMI* self)
{
+ set_debug_for_env();
DEBUGOUT("AssocInit() called");
DEBUGOUT("Leaving AssocInit()\n");
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/owning-job.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/owning-job.c 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/owning-job.c 2008-10-19 20:57:27 UTC (rev 1113)
@@ -414,6 +414,7 @@
Init(
CMPIInstanceMI* self)
{
+ set_debug_for_env();
DEBUGOUT("Initialize() called\n");
db_delete_dead_job_recs(NULL);
@@ -453,6 +454,7 @@
AssocInit(
CMPIAssociationMI* self)
{
+ set_debug_for_env();
DEBUGOUT("AssocInit() called");
DEBUGOUT("Leaving AssocInit()\n");
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/setting-define-build.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/setting-define-build.c 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/setting-define-build.c 2008-10-19 20:57:27 UTC (rev 1113)
@@ -436,6 +436,7 @@
Init(
CMPIInstanceMI* self)
{
+ set_debug_for_env();
DEBUGOUT("Initialize() called\n");
db_delete_dead_job_recs(NULL);
@@ -475,6 +476,7 @@
AssocInit(
CMPIAssociationMI* self)
{
+ set_debug_for_env();
DEBUGOUT("AssocInit() called");
DEBUGOUT("Leaving AssocInit()\n");
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.c 2008-10-19 20:57:27 UTC (rev 1113)
@@ -1,6 +1,9 @@
#include "vmbuilder-util.h"
#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
#include <errno.h>
#include <cmpidt.h>
#include <cmpift.h>
@@ -8,7 +11,48 @@
#include <cmpiutil/string.h>
#include <cmpiutil/exec.h>
+
+#ifdef XEN_VMBUILDER_DEBUG
+static int _is_debug = 1;
+#else
+static int _is_debug = 0;
+#endif
+
/******************************************************************************/
+void
+set_debug_for_env()
+{
+ const char* penv = getenv("VM_BUILDER_DEBUG");
+ if (NULL != penv)
+ {
+ if (strncmp(penv, "0", 1)
+ && strncasecmp(penv, "false", 5))
+ _is_debug = 1;
+ else
+ _is_debug = 0;
+ }
+#ifndef XEN_VMBUILDER_DEBUG
+ else
+ {
+ _is_debug = 0;
+ }
+#endif
+}
+
+/******************************************************************************/
+void
+vmbuilder_debug_out(const char* fmt, ...)
+{
+ if (_is_debug)
+ {
+ va_list ap;
+ va_start(ap, fmt);
+ vfprintf(stdout, fmt, ap);
+ va_end(ap);
+ }
+}
+
+/******************************************************************************/
CMPIArray*
str2UInt16Array(const CMPIBroker* broker, const char* str)
{
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-util.h 2008-10-19 20:57:27 UTC (rev 1113)
@@ -24,12 +24,9 @@
void set_dt_prop(const CMPIBroker* broker, VMBDBCtx dbctx, int col_ndx,
CMPIInstance* instance, const char* prop_name, CMPIBoolean isInterval);
char** get_job_names();
+void set_debug_for_env();
+void vmbuilder_debug_out(const char* fmt, ...);
-/* If built for debug, enable tracing */
-#ifdef XEN_VMBUILDER_DEBUG
-#define DEBUGOUT(fmt, args...) printf(fmt,## args)
-#else
-#define DEBUGOUT(fmt, args...)
-#endif
+#define DEBUGOUT(fmt, args...) vmbuilder_debug_out(fmt,## args)
#endif /* VMBUILDER_UTIL_H_GUARD */
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c 2008-10-17 08:36:30 UTC (rev 1112)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c 2008-10-19 20:57:27 UTC (rev 1113)
@@ -1335,6 +1335,7 @@
Init(
CMPIInstanceMI* self)
{
+ set_debug_for_env();
DEBUGOUT("Initialize() called\n");
/* Delete jobs xref recs for jobs that no longer exist */
@@ -1371,6 +1372,7 @@
MethodInit(
CMPIMethodMI * self)
{
+ set_debug_for_env();
DEBUGOUT("MethodInitialize() called\n");
// do work here if necessary
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
