Commit 53686f45 authored by Joseph Pallamidessi's avatar Joseph Pallamidessi

Fix segfault from reception vector

by using pointer instead, and thus fix #6
parent 2a9f2ba4
...@@ -54,10 +54,10 @@ void * CComUDPServer::UDP_server_thread(void *parm) { ...@@ -54,10 +54,10 @@ void * CComUDPServer::UDP_server_thread(void *parm) {
printf(" Received individual from %s:%d\n", inet_ntoa(cliaddr.sin_addr), ntohs(cliaddr.sin_port)); printf(" Received individual from %s:%d\n", inet_ntoa(cliaddr.sin_addr), ntohs(cliaddr.sin_port));
pthread_mutex_lock(&server_mutex); pthread_mutex_lock(&server_mutex);
/*process received data */ /*process received data */
RECV_DATA buffer_copy; recv_data buffer_copy;
memmove(buffer_copy.data,buffer,sizeof(char)*MAXINDSIZE); memmove(buffer_copy.data,buffer,sizeof(char)*MAXINDSIZE);
// printf("address %p\n",(p->data)); // printf("address %p\n",(p->data));
p->data.push_back(buffer_copy); p->data->push_back(buffer_copy);
(*p->nb_data)++; (*p->nb_data)++;
// printf("address %p\n",(p->data)); // printf("address %p\n",(p->data));
pthread_mutex_unlock(&server_mutex); pthread_mutex_unlock(&server_mutex);
...@@ -108,7 +108,7 @@ CComUDPServer::CComUDPServer(unsigned short port,int dg) { ...@@ -108,7 +108,7 @@ CComUDPServer::CComUDPServer(unsigned short port,int dg) {
this->parm->Socket = ServerSocket; this->parm->Socket = ServerSocket;
this->parm->ServAddr = ServAddr; this->parm->ServAddr = ServAddr;
this->parm->nb_data = &this->nb_data; this->parm->nb_data = &this->nb_data;
this->parm->data = this->data; this->parm->data = new std::vector<recv_data>;
this->parm->debug = this->debug; this->parm->debug = this->debug;
if(pthread_create(&thread, NULL, &CComUDPServer::UDP_server_thread, (void *)this->parm) != 0) { if(pthread_create(&thread, NULL, &CComUDPServer::UDP_server_thread, (void *)this->parm) != 0) {
......
...@@ -535,13 +535,13 @@ void CEvolutionaryAlgorithm::sendIndividual(){ ...@@ -535,13 +535,13 @@ void CEvolutionaryAlgorithm::sendIndividual(){
void CEvolutionaryAlgorithm::receiveIndividuals(){ void CEvolutionaryAlgorithm::receiveIndividuals(){
//Checking every generation for received individuals //Checking every generation for received individuals
if(this->server->parm->data.size() != 0){ if(this->server->parm->data->size() != 0){
//cout << "number of received individuals :" << this->server->nb_data << endl; //cout << "number of received individuals :" << this->server->nb_data << endl;
//cout << "number of treated individuals :" << this->treatedIndividuals << endl; //cout << "number of treated individuals :" << this->treatedIndividuals << endl;
CSelectionOperator *antiTournament = getSelectionOperator("Tournament",!this->params->minimizing, globalRandomGenerator); CSelectionOperator *antiTournament = getSelectionOperator("Tournament",!this->params->minimizing, globalRandomGenerator);
//Treating all the individuals before continuing //Treating all the individuals before continuing
while(this->server->parm->data.size() != 0){ while(this->server->parm->data->size() != 0){
//selecting the individual to erase //selecting the individual to erase
antiTournament->initialize(this->population->parents, 7, this->population->actualParentPopulationSize); antiTournament->initialize(this->population->parents, 7, this->population->actualParentPopulationSize);
unsigned index = antiTournament->selectNext(this->population->actualParentPopulationSize); unsigned index = antiTournament->selectNext(this->population->actualParentPopulationSize);
...@@ -552,8 +552,8 @@ void CEvolutionaryAlgorithm::receiveIndividuals(){ ...@@ -552,8 +552,8 @@ void CEvolutionaryAlgorithm::receiveIndividuals(){
//cout << "old individual fitness :" << this->population->parents[index]->fitness << endl; //cout << "old individual fitness :" << this->population->parents[index]->fitness << endl;
//cout << "old Individual :" << this->population->parents[index]->serialize() << endl; //cout << "old Individual :" << this->population->parents[index]->serialize() << endl;
this->server->read_data_lock(); this->server->read_data_lock();
string line = this->server->parm->data.back().data; string line = this->server->parm->data->back().data;
this->server->parm->data.pop_back(); this->server->parm->data->pop_back();
this->population->parents[index]->deserialize(line); this->population->parents[index]->deserialize(line);
//TAG THE INDIVIDUAL AS IMMIGRANT //TAG THE INDIVIDUAL AS IMMIGRANT
this->population->parents[index]->isImmigrant = true; this->population->parents[index]->isImmigrant = true;
......
...@@ -41,7 +41,7 @@ typedef struct { ...@@ -41,7 +41,7 @@ typedef struct {
int Socket; /* Socket descriptor for server */ int Socket; /* Socket descriptor for server */
struct sockaddr_in ServAddr; /* Local address */ struct sockaddr_in ServAddr; /* Local address */
int debug; int debug;
std::vector<recv_data> data; std::vector<recv_data>* data;
int *nb_data; int *nb_data;
}UDP_server_thread_parm_t; }UDP_server_thread_parm_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment