Ignore:
Timestamp:
Aug 9, 2018, 6:35:02 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
ea5b7d6
Parents:
fb975a50 (diff), 0c827019 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into jenkins-sandbox

Location:
libcfa/src/concurrency
Files:
2 added
21 moved

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/alarm.cfa

    rfb975a50 r455a7d5  
    2222}
    2323
    24 #include "alarm.h"
    25 #include "kernel_private.h"
    26 #include "preemption.h"
     24#include "alarm.hfa"
     25#include "kernel_private.hfa"
     26#include "preemption.hfa"
    2727
    2828//=============================================================================================

  • libcfa/src/concurrency/alarm.hfa

    rfb975a50 r455a7d5  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // alarm.h --
     7// alarm.hfa --
    88//
    99// Author           : Thierry Delisle
    … …  
    2121#include <assert.h>
    2222
    23 #include "time"
     23#include "time.hfa"
    2424
    2525struct thread_desc;

  • libcfa/src/concurrency/coroutine.cfa

    rfb975a50 r455a7d5  
    1414//
    1515
    16 #include "coroutine"
     16#include "coroutine.hfa"
    1717
    1818extern "C" {
    … …  
    2525}
    2626
    27 #include "kernel_private.h"
     27#include "kernel_private.hfa"
    2828
    2929#define __CFA_INVOKE_PRIVATE__

  • libcfa/src/concurrency/invoke.h

    rfb975a50 r455a7d5  
    1414//
    1515
    16 #include "bits/containers.h"
    17 #include "bits/defs.h"
    18 #include "bits/locks.h"
     16#include "bits/containers.hfa"
     17#include "bits/defs.hfa"
     18#include "bits/locks.hfa"
    1919
    2020#ifdef __cforall

  • libcfa/src/concurrency/kernel.cfa

    rfb975a50 r455a7d5  
    2727
    2828//CFA Includes
    29 #include "time"
    30 #include "kernel_private.h"
    31 #include "preemption.h"
    32 #include "startup.h"
     29#include "time.hfa"
     30#include "kernel_private.hfa"
     31#include "preemption.hfa"
     32#include "startup.hfa"
    3333
    3434//Private includes
    … …  
    833833// Debug
    834834__cfaabi_dbg_debug_do(
    835         void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
    836                 this.prev_name = prev_name;
    837                 this.prev_thrd = kernelTLS.this_thread;
     835        extern "C" {
     836                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
     837                        this.prev_name = prev_name;
     838                        this.prev_thrd = kernelTLS.this_thread;
     839                }
    838840        }
    839841)

  • libcfa/src/concurrency/kernel.hfa

    rfb975a50 r455a7d5  
    1919
    2020#include "invoke.h"
    21 #include "time_t.h"
     21#include "time_t.hfa"
    2222
    2323extern "C" {

  • libcfa/src/concurrency/kernel_private.hfa

    rfb975a50 r455a7d5  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // kernel_private.h --
     7// kernel_private.hfa --
    88//
    99// Author           : Thierry Delisle
    … …  
    1616#pragma once
    1717
    18 #include "kernel"
    19 #include "thread"
     18#include "kernel.hfa"
     19#include "thread.hfa"
    2020
    21 #include "alarm.h"
     21#include "alarm.hfa"
    2222
    2323

  • libcfa/src/concurrency/monitor.cfa

    rfb975a50 r455a7d5  
    1414//
    1515
    16 #include "monitor"
    17 
    18 #include <stdlib>
     16#include "monitor.hfa"
     17
     18#include <stdlib.hfa>
    1919#include <inttypes.h>
    2020
    21 #include "kernel_private.h"
    22 
    23 #include "bits/algorithms.h"
     21#include "kernel_private.hfa"
     22
     23#include "bits/algorithm.hfa"
    2424
    2525//-----------------------------------------------------------------------------

  • libcfa/src/concurrency/monitor.hfa

    rfb975a50 r455a7d5  
    2020#include <assert.h>
    2121#include "invoke.h"
    22 #include "stdlib"
     22#include "stdlib.hfa"
    2323
    2424trait is_monitor(dtype T) {

  • libcfa/src/concurrency/mutex.cfa

    rfb975a50 r455a7d5  
    1616//
    1717
    18 #include "mutex"
     18#include "mutex.hfa"
    1919
    20 #include "kernel_private.h"
     20#include "kernel_private.hfa"
    2121
    2222//-----------------------------------------------------------------------------

  • libcfa/src/concurrency/mutex.hfa

    rfb975a50 r455a7d5  
    2020#include <stdbool.h>
    2121
    22 #include "bits/algorithms.h"
    23 #include "bits/locks.h"
     22#include "bits/algorithm.hfa"
     23#include "bits/locks.hfa"
    2424
    2525#include "invoke.h"
    26 #include "time_t.h"
     26#include "time_t.hfa"
    2727
    2828//-----------------------------------------------------------------------------

  • libcfa/src/concurrency/preemption.cfa

    rfb975a50 r455a7d5  
    1414//
    1515
    16 #include "preemption.h"
     16#include "preemption.hfa"
    1717#include <assert.h>
    1818
    … …  
    2424}
    2525
    26 #include "bits/signal.h"
     26#include "bits/signal.hfa"
    2727
    2828#if !defined(__CFA_DEFAULT_PREEMPTION__)

  • libcfa/src/concurrency/preemption.hfa

    rfb975a50 r455a7d5  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // preemption.h --
     7// preemption.hfa --
    88//
    99// Author           : Thierry Delisle
    … …  
    1616#pragma once
    1717
    18 #include "alarm.h"
    19 #include "kernel_private.h"
     18#include "alarm.hfa"
     19#include "kernel_private.hfa"
    2020
    2121void kernel_start_preemption();

  • libcfa/src/concurrency/thread.cfa

    rfb975a50 r455a7d5  
    1414//
    1515
    16 #include "thread"
     16#include "thread.hfa"
    1717
    18 #include "kernel_private.h"
     18#include "kernel_private.hfa"
    1919
    2020#define __CFA_INVOKE_PRIVATE__

  • libcfa/src/concurrency/thread.hfa

    rfb975a50 r455a7d5  
    1919#include "invoke.h"
    2020
    21 #include "coroutine"
    22 #include "kernel"
    23 #include "monitor"
     21#include "coroutine.hfa"
     22#include "kernel.hfa"
     23#include "monitor.hfa"
    2424
    2525//-----------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.