Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
easea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Arnaud Kress
easea
Commits
6e4646a7
Commit
6e4646a7
authored
Jun 10, 2014
by
Joseph Pallamidessi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'devel', thus adding the networking
and memory leak fixes (#6) by
@pallamidessi
and @lukhio
parents
8bf4db08
53686f45
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 deletions
+16
-15
compiler/EaseaSym.cpp
compiler/EaseaSym.cpp
+1
-1
libeasea/CComUDPLayer.cpp
libeasea/CComUDPLayer.cpp
+5
-5
libeasea/CEvolutionaryAlgorithm.cpp
libeasea/CEvolutionaryAlgorithm.cpp
+6
-6
libeasea/include/CComUDPLayer.h
libeasea/include/CComUDPLayer.h
+4
-3
No files found.
compiler/EaseaSym.cpp
View file @
6e4646a7
...
@@ -164,8 +164,8 @@ void CSymbol::print(FILE *fp)
...
@@ -164,8 +164,8 @@ void CSymbol::print(FILE *fp)
fprintf
(
fp
,
" cudaMemcpy(ret,dev_ptr,sizeof(%s),cudaMemcpyDeviceToHost);
\n
"
,
sName
);
fprintf
(
fp
,
" cudaMemcpy(ret,dev_ptr,sizeof(%s),cudaMemcpyDeviceToHost);
\n
"
,
sName
);
//while (pSym=pSymbolList->walkToNextItem())
//while (pSym=pSymbolList->walkToNextItem())
//fprintf(fp," this->%s=ret->%s;\n",pSym->Object->sName,pSym->Object->sName);
//fprintf(fp," this->%s=ret->%s;\n",pSym->Object->sName,pSym->Object->sName);
fprintf
(
fp
,
" }
\n\n
"
);
}
}
fprintf
(
fp
,
" }
\n\n
"
);
}
}
// creation of class constructor
// creation of class constructor
...
...
libeasea/CComUDPLayer.cpp
View file @
6e4646a7
...
@@ -54,10 +54,11 @@ void * CComUDPServer::UDP_server_thread(void *parm) {
...
@@ -54,10 +54,11 @@ 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 */
memmove
(
p
->
data
[(
*
p
->
nb_data
)].
data
,
buffer
,
sizeof
(
char
)
*
MAXINDSIZE
)
;
recv_data
buffer_copy
;
(
*
p
->
nb_data
)
++
;
memmove
(
buffer_copy
.
data
,
buffer
,
sizeof
(
char
)
*
MAXINDSIZE
)
;
// printf("address %p\n",(p->data));
// printf("address %p\n",(p->data));
p
->
data
=
(
RECV_DATA
*
)
realloc
(
p
->
data
,
sizeof
(
RECV_DATA
)
*
((
*
p
->
nb_data
)
+
1
));
p
->
data
->
push_back
(
buffer_copy
);
(
*
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
);
/*reset receiving buffer*/
/*reset receiving buffer*/
...
@@ -71,7 +72,6 @@ CComUDPServer::CComUDPServer(unsigned short port,int dg) {
...
@@ -71,7 +72,6 @@ CComUDPServer::CComUDPServer(unsigned short port,int dg) {
struct
sockaddr_in
ServAddr
;
/* Local address */
struct
sockaddr_in
ServAddr
;
/* Local address */
debug
=
dg
;
debug
=
dg
;
this
->
nb_data
=
0
;
this
->
nb_data
=
0
;
this
->
data
=
(
RECV_DATA
*
)
calloc
(
1
,
sizeof
(
RECV_DATA
));
#ifdef WIN32
#ifdef WIN32
WSADATA
wsadata
;
WSADATA
wsadata
;
if
(
WSAStartup
(
MAKEWORD
(
1
,
1
),
&
wsadata
)
==
SOCKET_ERROR
)
{
if
(
WSAStartup
(
MAKEWORD
(
1
,
1
),
&
wsadata
)
==
SOCKET_ERROR
)
{
...
@@ -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
)
{
...
...
libeasea/CEvolutionaryAlgorithm.cpp
View file @
6e4646a7
...
@@ -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
->
treatedIndividuals
<
(
unsigned
)
this
->
server
->
nb_data
){
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
->
treatedIndividuals
<
(
unsigned
)
this
->
server
->
nb_data
){
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,14 +552,14 @@ void CEvolutionaryAlgorithm::receiveIndividuals(){
...
@@ -552,14 +552,14 @@ 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
[
this
->
treatedIndividuals
].
data
;
string
line
=
this
->
server
->
parm
->
data
->
back
().
data
;
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
;
this
->
server
->
read_data_unlock
();
this
->
server
->
read_data_unlock
();
//cout << "new Individual :" << this->population->parents[index]->serialize() << endl;
//cout << "new Individual :" << this->population->parents[index]->serialize() << endl;
this
->
treatedIndividuals
++
;
}
}
}
}
}
}
...
...
libeasea/include/CComUDPLayer.h
View file @
6e4646a7
...
@@ -27,12 +27,13 @@
...
@@ -27,12 +27,13 @@
#include <omp.h>
#include <omp.h>
#endif
#endif
#include <string>
#include <string>
#include <vector>
#define _MULTI_THREADED
#define _MULTI_THREADED
#define MAXINDSIZE 50000
/*maximum size of an individual in number of characters*/
#define MAXINDSIZE 50000
/*maximum size of an individual in number of characters*/
typedef
struct
{
typedef
struct
recv_data
{
char
data
[
MAXINDSIZE
];
char
data
[
MAXINDSIZE
];
}
RECV_DATA
;
}
RECV_DATA
;
...
@@ -40,7 +41,7 @@ typedef struct {
...
@@ -40,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
;
RECV_DATA
*
data
;
std
::
vector
<
recv_data
>*
data
;
int
*
nb_data
;
int
*
nb_data
;
}
UDP_server_thread_parm_t
;
}
UDP_server_thread_parm_t
;
...
@@ -48,7 +49,7 @@ class CComUDPServer {
...
@@ -48,7 +49,7 @@ class CComUDPServer {
public:
public:
int
debug
;
int
debug
;
RECV_DATA
*
data
;
std
::
vector
<
recv_data
>
data
;
int
nb_data
;
int
nb_data
;
UDP_server_thread_parm_t
*
parm
;
UDP_server_thread_parm_t
*
parm
;
CComUDPServer
(
unsigned
short
port
,
int
dg
);
CComUDPServer
(
unsigned
short
port
,
int
dg
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment