Changeset: 4568923fd477 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4568923fd477
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/modules/mal/sysmon.c
Branch: default
Log Message:
Fix compilation issue and use proper indent.
diffs (191 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2489,7 +2489,7 @@ str putNameLen(const char *nme, size_t l
str putRef;
str pyapi3Ref;
str pyapi3mapRef;
-lng qhead, qtail, qsize;
+size_t qhead, qtail, qsize;
str queryRef;
str querylogRef;
str raiseRef;
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -27,7 +27,7 @@
QueryQueue QRYqueue = NULL;
-lng qsize = 0, qhead = 0, qtail = 0;
+size_t qsize = 0, qhead = 0, qtail = 0;
static oid qtag= 1; // A unique query identifier
void
@@ -106,7 +106,7 @@ advanceQRYqueue(void)
void
dropQRYqueue(void)
{
- lng i;
+ size_t i;
MT_lock_set(&mal_delayLock);
for(i = 0; i < qsize; i++){
if( QRYqueue[i].query)
@@ -122,7 +122,7 @@ dropQRYqueue(void)
void
runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk)
{
- lng i, paused = 0;
+ size_t i, paused = 0;
str q;
QueryQueue tmp;
@@ -154,7 +154,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
paused += (QRYqueue[i].status[0] == 'p' ||
QRYqueue[i].status[0] == 'r'); /* running, prepared or paused */
}
assert(qhead < qsize);
- if( qsize - paused < MAL_MAXCLIENTS){
+ if( (int) (qsize - paused) < MAL_MAXCLIENTS){
qsize += MAL_MAXCLIENTS;
QRYqueue = (QueryQueue) GDKrealloc( QRYqueue, sizeof (struct
QRYQUEUE) * qsize);
if ( QRYqueue == NULL){
@@ -193,7 +193,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
void
runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk)
{
- lng i;
+ size_t i;
(void) cntxt;
(void) mb;
diff --git a/monetdb5/mal/mal_runtime.h b/monetdb5/mal/mal_runtime.h
--- a/monetdb5/mal/mal_runtime.h
+++ b/monetdb5/mal/mal_runtime.h
@@ -38,7 +38,7 @@ typedef struct QRYQUEUE{
time_t start;
time_t finished;
} *QueryQueue;
-mal_export lng qhead, qtail, qsize;
+mal_export size_t qhead, qtail, qsize;
typedef struct WORKINGSET{
Client cntxt;
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -30,7 +30,7 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
bat *f = getArgReference_bat(stk,pci,6);
bat *w = getArgReference_bat(stk,pci,7);
bat *m = getArgReference_bat(stk,pci,8);
- lng i, qtag;
+ lng qtag;
int wrk, mem, sz;
timestamp tsn;
str msg = MAL_SUCCEED;
@@ -61,52 +61,53 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
}
MT_lock_set(&mal_delayLock);
- for ( i = qtail; i != qhead; i++){
+ for (size_t i = qtail; i != qhead; i++){
if ( i == qsize){
i = 0;
if( i == qhead)
break;
}
- if( QRYqueue[i].query && (cntxt->user == MAL_ADMIN || cntxt->idx ==
QRYqueue[i].idx) ){
- qtag = (lng) QRYqueue[i].tag;
- if (BUNappend(tag, &qtag, false) != GDK_SUCCEED)
- goto bailout;
+ if( QRYqueue[i].query && (cntxt->user == MAL_ADMIN ||
cntxt->idx == QRYqueue[i].idx) ){
+ qtag = (lng) QRYqueue[i].tag;
+ if (BUNappend(tag, &qtag, false) != GDK_SUCCEED)
+ goto bailout;
- if (BUNappend(user, QRYqueue[i].username, false) !=
GDK_SUCCEED) {
- goto bailout;
- }
+ if (BUNappend(user, QRYqueue[i].username, false) !=
GDK_SUCCEED) {
+ goto bailout;
+ }
- if (BUNappend(sessionid, &(QRYqueue[i].idx), false) !=
GDK_SUCCEED) {
- goto bailout;
- }
+ if (BUNappend(sessionid, &(QRYqueue[i].idx), false) !=
GDK_SUCCEED) {
+ goto bailout;
+ }
- if (BUNappend(query, QRYqueue[i].query, false) != GDK_SUCCEED ||
- BUNappend(status, QRYqueue[i].status, false) !=
GDK_SUCCEED)
- goto bailout;
+ if (BUNappend(query, QRYqueue[i].query, false) !=
GDK_SUCCEED ||
+ BUNappend(status, QRYqueue[i].status, false) !=
GDK_SUCCEED)
+ goto bailout;
- /* convert number of seconds into a timestamp */
- tsn = timestamp_fromtime(QRYqueue[i].start);
- if (is_timestamp_nil(tsn)) {
- msg = createException(MAL, "SYSMONqueue",
SQLSTATE(22003) "cannot convert time");
- goto bailout;
- }
- if (BUNappend(started, &tsn, false) != GDK_SUCCEED)
- goto bailout;
+ /* convert number of seconds into a timestamp */
+ tsn = timestamp_fromtime(QRYqueue[i].start);
+ if (is_timestamp_nil(tsn)) {
+ msg = createException(MAL, "SYSMONqueue",
SQLSTATE(22003) "cannot convert time");
+ goto bailout;
+ }
+ if (BUNappend(started, &tsn, false) != GDK_SUCCEED)
+ goto bailout;
- tsn = timestamp_fromtime(QRYqueue[i].finished);
- if (is_timestamp_nil(tsn)) {
- msg = createException(MAL, "SYSMONqueue",
SQLSTATE(22003) "cannot convert time");
- goto bailout;
+ tsn = timestamp_fromtime(QRYqueue[i].finished);
+ if (is_timestamp_nil(tsn)) {
+ msg = createException(MAL, "SYSMONqueue",
SQLSTATE(22003) "cannot convert time");
+ goto bailout;
+ }
+ if (BUNappend(finished, &tsn, false) != GDK_SUCCEED)
+ goto bailout;
+
+ wrk = QRYqueue[i].workers;
+ mem = QRYqueue[i].memory;
+ if ( BUNappend(workers, &wrk, false) != GDK_SUCCEED ||
+ BUNappend(memory, &mem, false) != GDK_SUCCEED)
+ goto bailout;
}
- if (BUNappend(finished, &tsn, false) != GDK_SUCCEED)
- goto bailout;
-
- wrk = QRYqueue[i].workers;
- mem = QRYqueue[i].memory;
- if ( BUNappend(workers, &wrk, false) != GDK_SUCCEED ||
- BUNappend(memory, &mem, false) != GDK_SUCCEED)
- goto bailout;
- }}
+ }
MT_lock_unset(&mal_delayLock);
BBPkeepref( *t =tag->batCacheid);
BBPkeepref( *s =sessionid->batCacheid);
@@ -153,7 +154,7 @@ SYSMONpause(Client cntxt, MalBlkPtr mb,
if (tag < 1)
throw(MAL, "SYSMONpause", SQLSTATE(42000) "Tag must be
positive");
MT_lock_set(&mal_delayLock);
- for (lng i = qtail; i != qhead; i++){
+ for (size_t i = qtail; i != qhead; i++){
if( i == qsize){
i = 0;
if( i == qhead)
@@ -225,7 +226,7 @@ SYSMONstop(Client cntxt, MalBlkPtr mb, M
if (tag < 1)
throw(MAL, "SYSMONstop", SQLSTATE(42000) "Tag must be
positive");
MT_lock_set(&mal_delayLock);
- for (lng i = qtail; i != qhead; i++){
+ for (size_t i = qtail; i != qhead; i++){
if( i == qsize){
i = 0;
if( i == qhead)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
