Skip to content

Remove fixed size tid array #1

Merged
merged 1 commit into from
Oct 9, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ bit32_t n_aligned_pairs=0, n_unique_pairs=0, n_multiple_pairs=0; //number of pa
bit32_t n_aligned_a=0, n_unique_a=0, n_multiple_a=0; //number of a reads aligned
bit32_t n_aligned_b=0, n_unique_b=0, n_multiple_b=0; //number of b reads aligned
bit32_t ref_time, read_time;
bit16_t tid[64];
char version[] = "2.90";
ostringstream message;

Expand All @@ -56,7 +55,7 @@ void info(int level) {
pthread_mutex_t mutex_fin=PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t mutex_fout=PTHREAD_MUTEX_INITIALIZER;

void *t_SingleAlign(void *tid) {
void *t_SingleAlign(void *) {
SingleAlign a;
int n;
bit32_t cur_at;
Expand Down Expand Up @@ -85,13 +84,13 @@ void *t_SingleAlign(void *tid) {
void Do_SingleAlign() {
vector<pthread_t> pthread_ids(param.num_procs);
for(int i=0; i<param.num_procs; i++) {
tid[i]=i; pthread_create(&pthread_ids[i], NULL, t_SingleAlign, (void*)&tid[i]);
pthread_create(&pthread_ids[i], NULL, t_SingleAlign,NULL);
}
for(int i=0; i<param.num_procs; i++) pthread_join(pthread_ids[i], NULL);
};


void *t_PairAlign(void *tid) {
void *t_PairAlign(void *) {
PairAlign a;
int n1, n2;
bit32_t cur_at;
Expand Down Expand Up @@ -126,7 +125,7 @@ void Do_PairAlign() {
//create
//cout <<param.num_procs<<"num_procs\n";
for(int i=0; i<param.num_procs; i++) {
tid[i]=i; pthread_create(&pthread_ids[i], NULL, t_PairAlign, (void*)&tid[i]);
pthread_create(&pthread_ids[i], NULL, t_PairAlign,NULL);
}
for(int i=0; i<param.num_procs; i++) pthread_join(pthread_ids[i], NULL);
};
Expand Down