MonetDB: holindex - "Fix" output files.

[Eleni Petraki]

Changeset: 0c95004cc401 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c95004cc401
Modified Files:
        monetdb5/extras/crackers/crackers_holistic.h
        monetdb5/extras/crackers/crackers_select_ops.mx
        monetdb5/extras/crackers/crackers_selectholpl_ops.mx
        monetdb5/mal/mal_profiler.c
Branch: holindex
Log Message:

"Fix" output files.


diffs (87 lines):

diff --git a/monetdb5/extras/crackers/crackers_holistic.h 
b/monetdb5/extras/crackers/crackers_holistic.h
--- a/monetdb5/extras/crackers/crackers_holistic.h
+++ b/monetdb5/extras/crackers/crackers_holistic.h
@@ -36,7 +36,6 @@ typedef struct frequency{
 }FrequencyNode;
 
 typedef  str (*IdleFuncPtr)(int *);
-//crackers_export int isIdleQuery;
 crackers_export MT_Lock frequencylock;
 crackers_export MT_Lock CRKIndexLock;
 crackers_export pthread_rwlock_t CRKFirstPieceRWLock;
diff --git a/monetdb5/extras/crackers/crackers_select_ops.mx 
b/monetdb5/extras/crackers/crackers_select_ops.mx
--- a/monetdb5/extras/crackers/crackers_select_ops.mx
+++ b/monetdb5/extras/crackers/crackers_select_ops.mx
@@ -896,7 +896,16 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
        int gapH = 1;
        int pieces=0;
        FILE *ofp;
-       char outputFilename1[] = 
"/export/scratch2/petraki/experiments_paper1/cpu_cracking_pieces.txt";
+       char *outputFilename1;
+
+
+       //gettimeofday(&tv0,0);
+       
+       outputFilename1 = getenv("CRACKING_PIECES");
+       if (outputFilename1 == NULL){
+               fprintf(stderr, "Error: CRACKING_PIECES\n");
+               exit(1);
+       }
 
        ofp = fopen(outputFilename1,"a");
        if (ofp == NULL) {
diff --git a/monetdb5/extras/crackers/crackers_selectholpl_ops.mx 
b/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
--- a/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
+++ b/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
@@ -301,7 +301,7 @@ CRKrandomholpl_@1(int *bid, bit *inclusi
                //fprintf(ofp,"Idle_Query \t 0 \t Wait_time\t %9.6lf \t 
Selection_time\t %9.6lf \t Low= \t %d\n",wt,ct,(int)*low);
                GDKfree(low);
                //gettimeofday(&tv1,0); ct+=dt(tv0,tv1); tv0=tv1;
-
+               fclose(ofp);
                return 0;
        }
        /* Take the index of the bat */
@@ -401,6 +401,7 @@ CRKrandomholpl_@1(int *bid, bit *inclusi
 
        GDKfree(low);   
 
+       fclose(ofp);
        return 0;
 }
 
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -1345,12 +1345,18 @@ void HeartbeatCPUload(str (*IdleFunc)(in
        }
 }
 
-// Give users the option to check for the system load between two heart beats
+// Give users the option to check for the system total load between two heart 
beats
 void HeartbeatCPUload_total(void)
 {
        char cpuload[BUFSIZ];
        FILE *ofp;
-       char outputFilename1[] = 
"/export/scratch2/petraki/experiments_paper1/cpuload_cracking.txt";
+       char *outputFilename1;
+       
+       outputFilename1 = getenv("TOTAL_CPULOAD");
+       if (outputFilename1 == NULL){
+               fprintf(stderr, "Error: TOTAL_CPULOAD\n");
+               exit(1);
+       }
 
        ofp = fopen(outputFilename1,"a");
        if (ofp == NULL) {
@@ -1361,9 +1367,8 @@ void HeartbeatCPUload_total(void)
        while(1)
        {
                (void) getCPULoad(cpuload);
-               fprintf(ofp,"cpuload=%lf\n",corestat[256].load);
+               fprintf(ofp,"%lf\n",corestat[256].load);
                MT_sleep_ms(10);        
-               //fprintf(stderr,"%s\n",cpuload);
        }
        fclose(ofp);
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list