Changeset c1ce47 in git


Ignore:
Timestamp:
Mar 14, 2019, 12:29:08 PM (5 years ago)
Author:
Reimer Behrends <behrends@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
a6895f08280ec39a7714dbc7016f1a922a036609
Parents:
f0f000331ee031d3c29e77fd60b33f3dc7132e0b
Message:
Fixed systhreads build with ppcc.
Location:
Singular
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Singular/LIB/systhreads.lib

    rf0f0003 rc1ce47  
    1414
    1515static proc mod_init() {
    16   LIB "systhreads.so";
     16  load("systhreads.so");
    1717}
    1818

  • Singular/dyn_modules/systhreads/lintree.cc

    rf0f0003 rc1ce47  
    11#include "threadconf.h"
    2 #ifdef ENABLE_THREADS
    3 #include <factory/prelude.h>
    4 #endif
    52#include "lintree.h"
    63#include <iostream>

  • Singular/dyn_modules/systhreads/shared.cc

    rf0f0003 rc1ce47  
    11#include "threadconf.h"
    2 #ifdef ENABLE_THREADS
    3 #include <factory/prelude.h>
    4 #else
    5 #define SIMPLE_THREAD_VAR
    6 #endif
    72#include <iostream>
    83#include "kernel/mod2.h"
    … …  
    231226Lock master_lock(true);
    232227Lock name_lock(true);
    233 SIMPLE_THREAD_VAR long thread_id;
     228VAR long thread_id;
    234229long thread_counter;
    235230
    … …  
    13791374  master_lock.unlock();
    13801375#ifdef ENABLE_THREADS
    1381   onThreadInit();
     1376  extern void pSingular_initialize_thread();
     1377  pSingular_initialize_thread();
    13821378  siInit(global_argv0);
    13831379#endif
    … …  
    16301626};
    16311627
    1632 static SIMPLE_THREAD_VAR ThreadPool *currentThreadPoolRef;
    1633 static SIMPLE_THREAD_VAR Job *currentJobRef;
     1628STATIC_VAR ThreadPool *currentThreadPoolRef;
     1629STATIC_VAR Job *currentJobRef;
    16341630
    16351631class ThreadPool : public SharedObject {

  • Singular/dyn_modules/systhreads/thread.cc

    rf0f0003 rc1ce47  
    11#include "threadconf.h"
    2 #ifdef ENABLE_THREADS
    3 #include <factory/prelude.h>
    4 #endif
    52#include <list>
    63#include <vector>
Note: See TracChangeset for help on using the changeset viewer.