...
 
Commits (2)
...@@ -7,7 +7,7 @@ build-stable: ...@@ -7,7 +7,7 @@ build-stable:
stage: build stage: build
except: except:
- /^upstream/ - /^upstream/
image: gadl/spot-debuild:stable image: registry.lrde.epita.fr/spot-debuild:stable
script: script:
- ls -l - ls -l
- ./build.sh stable - ./build.sh stable
...@@ -20,7 +20,7 @@ build-unstable: ...@@ -20,7 +20,7 @@ build-unstable:
stage: build stage: build
except: except:
- /^upstream/ - /^upstream/
image: gadl/spot-debuild image: registry.lrde.epita.fr/spot-debuild
script: script:
- ls -l - ls -l
- ./build.sh unstable - ./build.sh unstable
......
...@@ -110,10 +110,10 @@ HL::ThreadHeap<NumHeaps, PerThreadHeap>::getThreadId (void) { ...@@ -110,10 +110,10 @@ HL::ThreadHeap<NumHeaps, PerThreadHeap>::getThreadId (void) {
return (int) lwp_self(); return (int) lwp_self();
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
return (int) pthread_self(); return (int) (size_t) pthread_self();
#endif #endif
#if defined(POSIX) #if defined(POSIX)
return (int) pthread_self(); return (int) (size_t) pthread_self();
#endif #endif
#if USE_SPROC #if USE_SPROC
// This hairiness has the same effect as calling getpid(), // This hairiness has the same effect as calling getpid(),
......
...@@ -246,6 +246,7 @@ static void * startMeUp (void * a) ...@@ -246,6 +246,7 @@ static void * startMeUp (void * a)
#include <dlfcn.h> #include <dlfcn.h>
#if ! defined(__APPLE__)
extern "C" int pthread_create (pthread_t *thread, extern "C" int pthread_create (pthread_t *thread,
const pthread_attr_t *attr, const pthread_attr_t *attr,
void * (*start_routine) (void *), void * (*start_routine) (void *),
...@@ -287,5 +288,6 @@ extern "C" int pthread_create (pthread_t *thread, ...@@ -287,5 +288,6 @@ extern "C" int pthread_create (pthread_t *thread,
return result; return result;
} }
#endif
#endif #endif
...@@ -304,7 +304,7 @@ unsigned int max_SCC_size = 1; ...@@ -304,7 +304,7 @@ unsigned int max_SCC_size = 1;
int running_job = 0; //(0 = forward reachibily, 1 = eliminating, 2 = exploring ) int running_job = 0; //(0 = forward reachibily, 1 = eliminating, 2 = exploring )
//mutex //mutex
pthread_mutex_t mutex; pthread_mutex_t mutex_;
// SCC representation // SCC representation
...@@ -1418,7 +1418,7 @@ void *thread_function( void *ptr ) ...@@ -1418,7 +1418,7 @@ void *thread_function( void *ptr )
if (terminating && !Finnished) // try lock evrything and try to terminate the job if (terminating && !Finnished) // try lock evrything and try to terminate the job
{ {
if (pthread_mutex_trylock(&mutex) == 0 ) if (pthread_mutex_trylock(&mutex_) == 0 )
{ {
//cout<<id<<" detecting the termination"<<endl; //cout<<id<<" detecting the termination"<<endl;
system_locked = true; // system locked - wait until others threads will wait then try to terminate the job system_locked = true; // system locked - wait until others threads will wait then try to terminate the job
...@@ -1883,7 +1883,7 @@ void *thread_function( void *ptr ) ...@@ -1883,7 +1883,7 @@ void *thread_function( void *ptr )
if(all_waiting) waiting_signal = true; //all others threads are not waiting if(all_waiting) waiting_signal = true; //all others threads are not waiting
} }
pthread_mutex_unlock(&mutex); // free the mutex pthread_mutex_unlock(&mutex_); // free the mutex
} }
} }
...@@ -2717,7 +2717,7 @@ if(Working_set != -1) ...@@ -2717,7 +2717,7 @@ if(Working_set != -1)
if (terminating && Queues[id].size() != 0) // try lock evrything and try to terminate the job if (terminating && Queues[id].size() != 0) // try lock evrything and try to terminate the job
{ {
if (pthread_mutex_trylock(&mutex) == 0 ) if (pthread_mutex_trylock(&mutex_) == 0 )
{ {
//cout<<id<<" detecting the termination"<<endl; //cout<<id<<" detecting the termination"<<endl;
system_locked = true; // system locked - wait until others threads will wait then try to terminate the job system_locked = true; // system locked - wait until others threads will wait then try to terminate the job
...@@ -3366,7 +3366,7 @@ if(Working_set != -1) ...@@ -3366,7 +3366,7 @@ if(Working_set != -1)
if(all_waiting) waiting_signal = true; //all others threads are not waiting if(all_waiting) waiting_signal = true; //all others threads are not waiting
} }
pthread_mutex_unlock(&mutex); // free the mutex pthread_mutex_unlock(&mutex_); // free the mutex
} }
} }
//end of termination detection //end of termination detection
...@@ -4079,7 +4079,7 @@ if(Working_set != -1) ...@@ -4079,7 +4079,7 @@ if(Working_set != -1)
if (terminating && !SCC_Finnished) // try lock evrything and try to terminate the job if (terminating && !SCC_Finnished) // try lock evrything and try to terminate the job
{ {
if (pthread_mutex_trylock(&mutex) == 0 ) if (pthread_mutex_trylock(&mutex_) == 0 )
{ {
//cout<<id<<" detecting the termination"<<endl; //cout<<id<<" detecting the termination"<<endl;
system_locked = true; // system locked - wait until others threads will wait then try to terminate the job system_locked = true; // system locked - wait until others threads will wait then try to terminate the job
...@@ -4283,7 +4283,7 @@ if(Working_set != -1) ...@@ -4283,7 +4283,7 @@ if(Working_set != -1)
if(all_waiting) waiting_signal = true; //all others threads are not waiting if(all_waiting) waiting_signal = true; //all others threads are not waiting
} }
pthread_mutex_unlock(&mutex); // free the mutex pthread_mutex_unlock(&mutex_); // free the mutex
} }
} }
} }
...@@ -5356,7 +5356,7 @@ int main(int argc, char** argv) ...@@ -5356,7 +5356,7 @@ int main(int argc, char** argv)
has_job.resize(Thread_count); has_job.resize(Thread_count);
//Mutex inicialization //Mutex inicialization
pthread_mutex_init( &mutex, NULL); pthread_mutex_init( &mutex_, NULL);
//waiting_status inicialization //waiting_status inicialization
waiting_status.resize(Thread_count); waiting_status.resize(Thread_count);
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
*/ */
#include <cstddef> #include <cstddef>
#include <bits/stl_iterator_base_types.h>
#include <cstddef>
#include <bits/stl_iterator_base_types.h>
namespace wibble { namespace wibble {
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#define WIBBLE_MIXIN_H #define WIBBLE_MIXIN_H
#include <cstddef> #include <cstddef>
#include <bits/stl_iterator_base_types.h>
namespace wibble { namespace wibble {
namespace mixin { namespace mixin {
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <vector> #include <vector>
#include <set> #include <set>
#include <algorithm> #include <algorithm>
#include <ext/algorithm>
#include <wibble/iterator.h> #include <wibble/iterator.h>
#include <wibble/exception.h> #include <wibble/exception.h>
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
*/ */
#include <cstddef> #include <cstddef>
#include <bits/stl_iterator_base_types.h>
#include <cstddef>
#include <bits/stl_iterator_base_types.h>
namespace wibble { namespace wibble {
......