[svn-commits] r188 - in branches/advisor/src/back/scf: hdr scm

[thial01 at ingres.com]

Author: thial01
Date: 2008-08-12 05:33:05 -0700 (Tue, 12 Aug 2008)
New Revision: 188

Modified:
   branches/advisor/src/back/scf/hdr/scmonitor.h
   branches/advisor/src/back/scf/scm/scmonitor.sc
Log:
ESQL/C can't handle my header file :( - see #174


Modified: branches/advisor/src/back/scf/hdr/scmonitor.h
===================================================================
--- branches/advisor/src/back/scf/hdr/scmonitor.h	2008-08-12 12:24:40 UTC (rev 187)
+++ branches/advisor/src/back/scf/hdr/scmonitor.h	2008-08-12 12:33:05 UTC (rev 188)
@@ -4,7 +4,7 @@
 */
 
 /**
-** Name: SCMONITOR.HL - This file contains the structs used by the monitor daemon
+** Name: SCMONITOR.H - This file contains the structs used by the monitor daemon
 ** 
 ** Description:
 **      This file contains the esql definitions of the structures used by
@@ -16,22 +16,6 @@
 **	    File created
 **/
 
-/* How long do we sleep between wake-ups? */
-#define		SLEEP		30000
-/* How often do we wake up until we store data in workload DB? */
-#define		ROUNDS		5
-/* How often do we store until we delete old entries from the workload DB? */
-#define		DELOLD		5
-/* And how old are the entries we delete (in seconds) */
-#define		OLDENTRY	60*60*24*7
-
-/* 
-** Define new maximum number of objects to monitor 
-** as the monitor may need to fit more than the DBMS
-*/
-#define		MAXMON		MAXMONITOR * ROUNDS
-#define		MAXWKL		MAXWORKLOAD * ROUNDS
-
 typedef struct _ESQL_SCM_STATEMENT
 {
 	char		server[DB_MAXNAME*2];

Modified: branches/advisor/src/back/scf/scm/scmonitor.sc
===================================================================
--- branches/advisor/src/back/scf/scm/scmonitor.sc	2008-08-12 12:24:40 UTC (rev 187)
+++ branches/advisor/src/back/scf/scm/scmonitor.sc	2008-08-12 12:33:05 UTC (rev 188)
@@ -74,11 +74,6 @@
 // #define		DEBUG	
 
 /* Global definitions */
-exec sql begin declare section;
-	char	db_name[DB_MAXNAME];
-	exec sql include '../hdr/scmonitor.h';
-	ESQL_SCM	*scm;
-exec sql end declare section;
 
 /* How long do we sleep between wake-ups? */
 #define		SLEEP		30000
@@ -96,6 +91,11 @@
 #define		MAXMON		MAXMONITOR * ROUNDS
 #define		MAXWKL		MAXWORKLOAD * ROUNDS
 
+exec sql begin declare section;
+	char	db_name[DB_MAXNAME];
+	exec sql include '../hdr/scmonitor.h';
+	ESQL_SCM	*scm;
+exec sql end declare section;
 
 /*{
 **