Changeset: ef1d03852ea4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef1d03852ea4
Modified Files:
monetdb5/extras/crackers/crackers_holistic.c
monetdb5/extras/crackers/crackers_holistic.h
Branch: holindex
Log Message:
Remove code that is not used.
diffs (203 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
@@ -31,9 +31,6 @@ static MT_Id *idletime_thread;
MT_Lock frequencylock;
MT_Lock CRKIndexLock;
pthread_rwlock_t CRKFirstPieceRWLock;
-
-
-//int isIdleQuery = 0;
IdleFuncPtr IdleFunc;
str
@@ -66,7 +63,6 @@ CRKinitHolisticUpdates(int *ret)
return MAL_SUCCEED;
}
-
/*singleton pattern*/
FrequencyNode *
getFrequencyStruct(char which)
@@ -83,13 +79,22 @@ getFrequencyStruct(char which)
default:
assert(0);
}
-
/* GDKzalloc = calloc = malloc + memset(0) */
if (*theNode == NULL)
*theNode = GDKzalloc(sizeof(FrequencyNode));
return *theNode;
}
+
+str
+CRKinitFrequencyStruct(int *vid,int bid)
+{
+ FrequencyNode *fs = getFrequencyStruct('A');
+ push(bid,fs);
+ (void) vid;
+ return MAL_SUCCEED;
+}
+
/*this function pushes nodes in the list and is used in cost models:
2,4,6,8,10*/
void
push(int bat_id,FrequencyNode* head)
@@ -107,31 +112,17 @@ push(int bat_id,FrequencyNode* head)
head->next=new_node;
//MT_lock_unset(&frequencylock, "getFrequencyStruct");
}
-/*this function pushes nodes in the list and is used in cost models: 1,3,5*/
-void
-push_2(int bat_id,FrequencyNode* head,int N,int L1)
+
+FrequencyNode*
+searchBAT(FrequencyNode* head,int bat_id)
{
- FrequencyNode* new_node;
- //MT_lock_set(&frequencylock, "getFrequencyStruct");
- new_node=(FrequencyNode *) GDKmalloc(sizeof(FrequencyNode));
- new_node->bid=bat_id;
- new_node->c=1;
- new_node->f1=0;
- new_node->f2=0;
- new_node->weight=N-L1;
- new_node->next=head->next;
- head->next=new_node;
- //MT_lock_unset(&frequencylock, "getFrequencyStruct");
-}
-
-FrequencyNode*
-pop(FrequencyNode* head)
-{
- FrequencyNode* dummy;
- dummy=head->next;
- head->next=head->next->next;
- GDKfree(dummy);
- return head;
+ FrequencyNode* temp;
+ temp=head;
+ while((temp->bid != bat_id))
+ {
+ temp=temp->next;
+ }
+ return temp;
}
void
@@ -146,17 +137,6 @@ printFrequencyStruct(FrequencyNode* head
}
}
-FrequencyNode*
-searchBAT(FrequencyNode* head,int bat_id)
-{
- FrequencyNode* temp;
- temp=head;
- while((temp->bid != bat_id))
- {
- temp=temp->next;
- }
- return temp;
-}
/*this function returns the maximum weight from the list and is used for all
the cost models*/
FrequencyNode*
findMax(FrequencyNode* head)
@@ -180,6 +160,7 @@ findMax(FrequencyNode* head)
}
return ret_node;
}
+
/*this function returns the maximum weight (excluding the bid weight) from the
list and is used for all the cost models*/
FrequencyNode*
findOtherMax(FrequencyNode* head, int bat_id)
@@ -336,61 +317,6 @@ changeWeight_3(FrequencyNode* node,int N
}
-void
-deleteNode(FrequencyNode* head,int bat_id)
-{
- FrequencyNode* temp;
- temp=head;
- while((temp->next != NULL))
- {
- if(temp->next->bid == bat_id)
- {
- temp->next=temp->next->next;
- break;
- }
- temp=temp->next;
- }
-
-}
-
-str
-CRKinitFrequencyStruct(int *vid,int bid)
-{
- FrequencyNode *fs = getFrequencyStruct('A');
- push(bid,fs);
- (void) vid;
- return MAL_SUCCEED;
-}
-
-
-/*this function initializes the list in the first & second experiment(1st &
2nd cost model)*/
-str
-CRKinitFrequencyStruct_2(int *vid,int *bid,int* N,int* L1)
-{
- FrequencyNode *fs = getFrequencyStruct('A');
- push_2(*bid,fs,*N,*L1);
- *vid = 0;
- return MAL_SUCCEED;
-}
-
-
-/*this function changes the frequencies into 0 in the end of the idle time
interval*/
-str
-CRKzeroFrequency(int *vid)
-{
- FrequencyNode *fs = getFrequencyStruct('A');
- FrequencyNode* temp;
- temp=fs;
- while(temp != NULL)
- {
- temp->f1=0;
- temp->f2=0;
- temp=temp->next;
- }
- *vid = 0;
- return MAL_SUCCEED;
-}
-
/*This function is used during idle time for all the cost models*/
str
CRKrandomCrack(int *ret)
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
@@ -43,8 +43,6 @@ crackers_export pthread_rwlock_t CRKFirs
crackers_export FrequencyNode *getFrequencyStruct(char which);
crackers_export void push(int bat_id,FrequencyNode* head);
-crackers_export void push_2(int bat_id,FrequencyNode* head,int N,int L1);
-crackers_export FrequencyNode* pop(FrequencyNode* head);
crackers_export void printFrequencyStruct(FrequencyNode* head);
crackers_export FrequencyNode* searchBAT(FrequencyNode* head,int bat_id);
crackers_export double changeWeight_1(FrequencyNode* node,int N,int L1);
@@ -54,15 +52,12 @@ crackers_export double changeWeight(Freq
crackers_export FrequencyNode* findMax(FrequencyNode* head);
crackers_export FrequencyNode* findOtherMax(FrequencyNode* head,int bat_id);
crackers_export FrequencyNode* pickRandom(FrequencyNode* head);
-crackers_export void deleteNode(FrequencyNode* head,int bat_id);
crackers_export IdleFuncPtr IdleFunc;
crackers_export str CRKinitHolistic(int *ret);
crackers_export str CRKinitHolisticUpdates(int *ret);
crackers_export str CRKinitFrequencyStruct(int *vid,int bid);
-crackers_export str CRKinitFrequencyStruct_2(int *vid,int *bid,int* N,int* L1);
crackers_export str CRKrandomCrack(int *ret);
crackers_export str CRKrandomCrackST(int *ret);
-crackers_export str CRKzeroFrequency(int *vid);
crackers_export str CRKrandomCrackUpdates(int *ret);
#endif /*crackers_holistic*/
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
