MonetDB: holindex - Check if updates are activated using environ...

[Eleni Petraki]

Changeset: 5727974293b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5727974293b0
Modified Files:
        monetdb5/extras/crackers/crackers_holistic.c
        monetdb5/extras/crackers/crackers_holistic.mal
        monetdb5/extras/crackers/crackers_updates.mx
Branch: holindex
Log Message:

Check if updates are activated using environment variable.


diffs (102 lines):

diff --git a/monetdb5/extras/crackers/crackers_holistic.c 
b/monetdb5/extras/crackers/crackers_holistic.c
--- a/monetdb5/extras/crackers/crackers_holistic.c
+++ b/monetdb5/extras/crackers/crackers_holistic.c
@@ -38,35 +38,55 @@ str
 CRKinitHolistic(int *ret)
 {
        char *p = getenv("MOTIVATION_EXPERIMENT");
-       int motivation_experiment=0;
+       char *up = getenv("UPDATES");
+       int motivation_experiment=0, updates_activated=0;
        int i=0;
 
-       if (p == NULL){
+       if (p == NULL || up == NULL){
                fprintf(stderr, "Error initHolistic: environment variable is 
missing.\n");
                exit(1);
        }
        else
+       {
                motivation_experiment=atoi(p);
+               updates_activated=atoi(up);
+       }
 
-       IdleFunc=&CRKrandomCrack;
-       idletime_thread = GDKzalloc(sizeof(*idletime_thread));
-       cpuload_thread = GDKzalloc(sizeof(*idletime_thread));
-       MT_lock_init(&frequencylock, "FrequencyStruct");
-       for (i=0;i<LOCKS;i++)
-               MT_lock_init(&CRKIndexLock[i], "Cracker Index Lock");
-       //MT_lock_init(&CRKIndexLock, "Cracker Index Lock");
-       MT_create_thread(idletime_thread,(void (*)(void *))HeartbeatCPUload, 
IdleFunc, MT_THR_JOINABLE);
-       if (motivation_experiment != 0)
-               MT_create_thread(cpuload_thread,(void (*)(void 
*))HeartbeatCPUload_total, NULL, MT_THR_JOINABLE);
-       *ret = 0;
+       if(updates_activated == 0)
+       {
+               IdleFunc=&CRKrandomCrack;
+               idletime_thread = GDKzalloc(sizeof(*idletime_thread));
+               cpuload_thread = GDKzalloc(sizeof(*idletime_thread));
+               MT_lock_init(&frequencylock, "FrequencyStruct");
+               for (i=0;i<LOCKS;i++)
+                       MT_lock_init(&CRKIndexLock[i], "Cracker Index Lock");
+               //MT_lock_init(&CRKIndexLock, "Cracker Index Lock");
+               MT_create_thread(idletime_thread,(void (*)(void 
*))HeartbeatCPUload, IdleFunc, MT_THR_JOINABLE);
+               if (motivation_experiment != 0)
+                       MT_create_thread(cpuload_thread,(void (*)(void 
*))HeartbeatCPUload_total, NULL, MT_THR_JOINABLE);
+               *ret = 0;
+       }
        return MAL_SUCCEED;
 }
 
 str
 CRKinitHolisticUpdates(int *ret)
 {
-        MT_lock_init(&frequencylock, "FrequencyStruct");
-        *ret = 0;
+        char *up = getenv("UPDATES");
+        int updates_activated=0;
+
+        if (up == NULL){
+                fprintf(stderr, "Error initHolistic: environment variable is 
missing.\n");
+                exit(1);
+        }
+        else
+                updates_activated=atoi(up);
+
+        if(updates_activated == 1)
+        {  
+               MT_lock_init(&frequencylock, "FrequencyStruct");
+               *ret = 0;
+       }
         return MAL_SUCCEED;
 }
 
diff --git a/monetdb5/extras/crackers/crackers_holistic.mal 
b/monetdb5/extras/crackers/crackers_holistic.mal
--- a/monetdb5/extras/crackers/crackers_holistic.mal
+++ b/monetdb5/extras/crackers/crackers_holistic.mal
@@ -36,5 +36,5 @@ command zeroFrequency():void
 address CRKzeroFrequency
 comment "Turn the frequency into 0 value.";
 
-#crackers.holisticpreludeUpdates();
+crackers.holisticpreludeUpdates();
 crackers.holisticprelude();
diff --git a/monetdb5/extras/crackers/crackers_updates.mx 
b/monetdb5/extras/crackers/crackers_updates.mx
--- a/monetdb5/extras/crackers/crackers_updates.mx
+++ b/monetdb5/extras/crackers/crackers_updates.mx
@@ -1022,11 +1022,11 @@ sizeCrackerInsertions(int bid){
                        mnstr_printf(GDKout,"\n crack print insertions: Failed 
to access insertions.");
                        return;
                }
-               printf("\n pending insertions size: "BUNFMT" \n",BATcount(u));
+               //printf("\n pending insertions size: "BUNFMT" \n",BATcount(u));
                BBPunfix(u->batCacheid);
        }
-       else
-               printf("\n pending insertions size: 0 \n");
+       //else
+               //printf("\n pending insertions size: 0 \n");
 }
 
 static str
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list