IDS Forum

Re: BETA Test of New Features in dostats

Posted By: CHRISTIAN KNAPPKE
Date: Friday, 10 July 2009, at 5:37 a.m.

In Response To: Re: BETA Test of New Features in dostats (CHRISTIAN KNAPPKE)

Sorry, but I forgot to mention that there need to be some changes to dostats.ec before it compiles.
See diff:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/dostats.ec b/dostats.ec
index 933ca96..dd86114 100755
--- a/dostats.ec
+++ b/dostats.ec
@@ -362,6 +362,10 @@
#include <strings.h>
#endif
#include <signal.h>
+#if defined(_WINDOWS_)
+#include <windows.h>
+#define SIGQUIT SIGBREAK
+#endif
/*
* Define HAVE_GETOPT_H if you are using GNU's or my version of getopt on a
* platform that does not have it already or if your platform does not define
@@ -477,7 +481,7 @@ void timediff( struct timeval, struct timeval, int *, int * );
#endif
void usage( char *program );
void exit( int stat );
-void shutdown( int sig );
+void dostats_shutdown( int sig ); /* Renamed from shutdown() because of conflicts with winsock2.h */
#define STR_STEP 1024
void readlist( char **, int *, char **, int *, char * );
void appendStr( char **, int *, char * );
@@ -502,10 +506,12 @@ int is_Server_Optimized( int major, int minor, char *level );
*target = 0; \

}
#else
+#ifndef max
inline int max( int a, int b)
{

return (a > b ? a : b);
}
+#endif
inline void strlower( char *target, char *source, int max )
{

while (max-- && *source) {
@@ -516,14 +522,14 @@ inline void strlower( char *target, char *source, int max )
#endif

-void shutdown( int sig )
+void dostats_shutdown( int sig )
{

sqlbreak();

if (conn == 1 && Release != 5) {
- EXEC SQL SET CONNECTION "WORK";
+ EXEC SQL SET CONNECTION 'WORK';
sqlbreak();

} else if (Release != 5) {
- EXEC SQL SET CONNECTION "DBASES";
+ EXEC SQL SET CONNECTION 'DBASES';
sqlbreak();

}

EXEC SQL DISCONNECT ALL;
@@ -575,8 +581,8 @@ int main(int argc, char *argv[])

};

int longint;

- signal( SIGINT, shutdown );
- signal( SIGQUIT, shutdown );
+ signal( SIGINT, dostats_shutdown );
+ signal( SIGQUIT, dostats_shutdown );

if (getenv( "DELIMIDENT" ) != (char *)NULL) {
QuotedIdents = 1;
@@ -1467,7 +1473,7 @@ int main(int argc, char *argv[])

if (have_smi && (!singledb || doBrowse || doDistAging)) {
if (username[0] != (char)0) {

if (passwd[0] != (char)0)
- EXEC SQL CONNECT TO :connhost AS "DBASES"
+ EXEC SQL CONNECT TO :connhost AS 'DBASES'

USER :username USING :passwd

WITH CONCURRENT TRANSACTION;

else {
@@ -1477,7 +1483,7 @@ int main(int argc, char *argv[])

exit( 1 );

}
} else
- EXEC SQL CONNECT TO :connhost AS "DBASES"
+ EXEC SQL CONNECT TO :connhost AS 'DBASES'

WITH CONCURRENT TRANSACTION;
if (sqlca.sqlcode) {

fprintf( stderr,
@@ -1603,7 +1609,7 @@ int main(int argc, char *argv[])

} else

numparts = 0;

if (singledb) {
- EXEC SQL DISCONNECT "DBASES";
+ EXEC SQL DISCONNECT 'DBASES';

if (sqlca.sqlcode) {

fprintf( stderr,

"FAILED: Cannot safely disconnect from sysmaster! "
@@ -1623,7 +1629,7 @@ int main(int argc, char *argv[])

if (username[0] != (char)0) {
if (passwd[0] != (char)0)
- EXEC SQL CONNECT TO :connhost AS "WORK"
+ EXEC SQL CONNECT TO :connhost AS 'WORK'

USER :username USING :passwd

WITH CONCURRENT TRANSACTION;
else {
@@ -1633,7 +1639,7 @@ int main(int argc, char *argv[])

exit( 1 );
}

} else
- EXEC SQL CONNECT TO :connhost AS "WORK"
+ EXEC SQL CONNECT TO :connhost AS 'WORK'

WITH CONCURRENT TRANSACTION;

if (sqlca.sqlcode) {
fprintf( stderr,
@@ -1792,7 +1798,7 @@ int main(int argc, char *argv[])
/* Connection to sysadmin for scheduling if needed. */
if (username[0] != (char)0) {

if (passwd[0] != (char)0)
- EXEC SQL CONNECT TO :connhost AS "SCHEDULER"
+ EXEC SQL CONNECT TO :connhost AS 'SCHEDULER'

USER :username USING :passwd

WITH CONCURRENT TRANSACTION;

else {
@@ -1802,7 +1808,7 @@ int main(int argc, char *argv[])

exit( 1 );

}
} else
- EXEC SQL CONNECT TO :connhost AS "SCHEDULER"
+ EXEC SQL CONNECT TO :connhost AS 'SCHEDULER'

WITH CONCURRENT TRANSACTION;
if (sqlca.sqlcode) {

fprintf( stderr,
@@ -1837,7 +1843,7 @@ int main(int argc, char *argv[])

}

if (!singledb) {
- EXEC SQL SET CONNECTION "DBASES";
+ EXEC SQL SET CONNECTION 'DBASES';
if (sqlca.sqlcode) {

fprintf( stderr,

"FAILED %d: Cannot set connection to (%s); error=%d, isam=%d\n",
@@ -1871,7 +1877,7 @@ int main(int argc, char *argv[])

once = 1;

}
} else {
- EXEC SQL SET CONNECTION "DBASES";
+ EXEC SQL SET CONNECTION 'DBASES';

conn = 1;

if (sqlca.sqlcode) {

fprintf( stderr,
@@ -1946,7 +1952,7 @@ int main(int argc, char *argv[])

exit( 1 );

}

unlink( schedprocfilename );
- EXEC SQL SET CONNECTION "SCHEDULER";
+ EXEC SQL SET CONNECTION 'SCHEDULER';

if (sqlca.sqlcode != 0) {

fprintf( stderr,

"Error changing connections to SCHEDULER: %s! SQL: %d ISAM: %d\n",
@@ -2023,7 +2029,7 @@ int main(int argc, char *argv[])

if (have_smi && !singledb) {

/* Switch to connection for table work. */
- EXEC SQL SET CONNECTION "WORK";
+ EXEC SQL SET CONNECTION 'WORK';

conn = 2;

if (sqlca.sqlcode) {

fprintf( stderr,
@@ -4534,7 +4540,7 @@ int main(int argc, char *argv[])
fflush( schedfile );
fclose( schedfile );

- EXEC SQL SET CONNECTION "WORK";
+ EXEC SQL SET CONNECTION 'WORK';
if (sqlca.sqlcode) {

fprintf( stderr,

"FAILED %d: Cannot set connection to (%s); error=%d, isam=%d\n",
@@ -4574,7 +4580,7 @@ int main(int argc, char *argv[])

exit( 1 );
}
unlink( schedprocfilename );
- EXEC SQL SET CONNECTION "SCHEDULER";
+ EXEC SQL SET CONNECTION 'SCHEDULER';
if (sqlca.sqlcode != 0) {

fprintf( stderr,

"Error changing connections to SCHEDULER: %s! SQL: %d ISAM: %d\n",
@@ -5166,8 +5172,9 @@ void usage( char *program )

}
}

-
+#if !defined(MAXWORD)
#define MAXWORD 65536
+#endif

/* Remove 'out' & 'inout' parameter type entries from parameter type lists. */
void StripTypeList( char *list )
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Messages In This Thread

• BETA Test of New Features in dostats
  Art Kagel -- Wednesday, 24 June 2009, at 9:45 p.m.
  • Re: BETA Test of New Features in dostats
    Peter_Logan@spartanstores.com -- Thursday, 25 June 2009, at 9:13 a.m.
  • Re: BETA Test of New Features in dostats
    Jean Sagi -- Friday, 26 June 2009, at 9:06 a.m.
    • RE: BETA Test of New Features in dostats
      Art S. Kagel -- Friday, 26 June 2009, at 9:59 a.m.
    • Re: BETA Test of New Features in dostats
      CHRISTIAN KNAPPKE -- Friday, 10 July 2009, at 3:14 a.m.
      • Re: BETA Test of New Features in dostats
        CHRISTIAN KNAPPKE -- Friday, 10 July 2009, at 5:37 a.m.

IDS Forum is maintained by Administrator with WebBBS 5.12.