Changeset 55b060d


Ignore:
Timestamp:
Aug 30, 2023, 10:13:45 PM (21 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
master
Children:
0b8c951d
Parents:
38de914
Message:

rename directories containers to collections

Files:
30 edited
18 moved

Legend:

Unmodified
Added
Removed

  • driver/cfa.cc

    r38de914 r55b060d  
    1010// Created On       : Tue Aug 20 13:44:49 2002
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Jun  9 14:36:41 2023
    13 // Update Count     : 479
     12// Last Modified On : Wed Aug 30 21:48:48 2023
     13// Update Count     : 480
    1414//
    1515
    … …  
    361361                } // if
    362362                args[nargs++] = "-I" CFA_INCDIR "concurrency";
    363                 args[nargs++] = "-I" CFA_INCDIR "containers";
     363                args[nargs++] = "-I" CFA_INCDIR "collections";
    364364                libbase = CFA_LIBDIR;
    365365                break;
    … …  
    372372                } // if
    373373                args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/concurrency";
    374                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/containers";
     374                args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/collections";
    375375
    376376                libbase = TOP_BUILDDIR "libcfa/";

  • libcfa/src/Makefile.am

    r38de914 r55b060d  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Mon Aug 14 17:10:51 2023
    14 ## Update Count     : 262
     13## Last Modified On : Wed Aug 30 21:22:45 2023
     14## Update Count     : 263
    1515###############################################################################
    1616
    … …  
    5252        bits/algorithm.hfa \
    5353        bits/align.hfa \
    54         bits/containers.hfa \
     54        bits/collections.hfa \
    5555        bits/debug.hfa \
    5656        bits/defs.hfa \
    … …  
    6363        concurrency/iofwd.hfa \
    6464        concurrency/barrier.hfa \
    65         containers/array.hfa \
    66         containers/list.hfa \
    67         containers/lockfree.hfa \
    68         containers/string_sharectx.hfa \
    69         containers/vector2.hfa \
     65        collections/array.hfa \
     66        collections/list.hfa \
     67        collections/lockfree.hfa \
     68        collections/string_sharectx.hfa \
     69        collections/vector2.hfa \
    7070        vec/vec.hfa \
    7171        vec/vec2.hfa \
    … …  
    8989        bits/weakso_locks.hfa \
    9090        algorithms/range_iterator.hfa \
    91         containers/maybe.hfa \
    92         containers/pair.hfa \
    93         containers/result.hfa \
    94         containers/string.hfa \
    95         containers/string_res.hfa \
    96         containers/vector.hfa \
     91        collections/maybe.hfa \
     92        collections/pair.hfa \
     93        collections/result.hfa \
     94        collections/string.hfa \
     95        collections/string_res.hfa \
     96        collections/vector.hfa \
    9797        device/cpu.hfa
    9898

  • libcfa/src/bits/collections.hfa

    r38de914 r55b060d  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // bits/containers.hfa -- Intrusive generic containers.hfa
     7// bits/collections.hfa -- Intrusive generic collections
    88//
    99// Author           : Thierry Delisle
    1010// Created On       : Tue Oct 31 16:38:50 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Feb  2 11:33:08 2023
    13 // Update Count     : 29
     12// Last Modified On : Wed Aug 30 21:26:39 2023
     13// Update Count     : 30
    1414
    1515#pragma once

  • libcfa/src/bits/weakso_locks.hfa

    r38de914 r55b060d  
    2020#include "bits/locks.hfa"
    2121#include "bits/sequence.hfa"
    22 #include "bits/containers.hfa"
    23 #include "containers/list.hfa"
     22#include "bits/collections.hfa"
     23#include "collections/list.hfa"
    2424
    2525struct select_node;

  • libcfa/src/collections/maybe.cfa

    r38de914 r55b060d  
    1010// Created On       : Wed May 24 15:40:00 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Feb 17 11:22:03 2019
    13 // Update Count     : 3
     12// Last Modified On : Wed Aug 30 21:26:55 2023
     13// Update Count     : 4
    1414//
    1515
    16 #include <containers/maybe.hfa>
     16#include <collections/maybe.hfa>
    1717#include <assert.h>
    1818

  • libcfa/src/collections/pair.cfa

    r38de914 r55b060d  
    66// Author           : Aaron Moss
    77// Created On       : Wed Apr 12 15:32:00 2017
    8 // Last Modified By : Aaron Moss
    9 // Last Modified On : Wed Apr 12 15:32:00 2017
    10 // Update Count     : 1
     8// Last Modified By : Peter A. Buhr
     9// Last Modified On : Wed Aug 30 21:27:12 2023
     10// Update Count     : 2
    1111//
    1212
    13 #include <containers/pair.hfa>
     13#include <collections/pair.hfa>
    1414
    1515forall(R, S

  • libcfa/src/collections/result.cfa

    r38de914 r55b060d  
    1010// Created On       : Wed May 24 15:40:00 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Feb 17 11:24:04 2019
    13 // Update Count     : 3
     12// Last Modified On : Wed Aug 30 21:27:22 2023
     13// Update Count     : 4
    1414//
    1515
    16 #include <containers/result.hfa>
     16#include <collections/result.hfa>
    1717#include <assert.h>
    1818

  • libcfa/src/collections/vector.cfa

    r38de914 r55b060d  
    1010// Created On       : Tue Jul  5 18:07:52 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Jul  5 18:08:31 2016
    13 // Update Count     : 2
     12// Last Modified On : Wed Aug 30 21:27:31 2023
     13// Update Count     : 3
    1414//
    1515
    16 #include <containers/vector.hfa>
     16#include <collections/vector.hfa>
    1717
    1818#include <stdlib.hfa>

  • libcfa/src/concurrency/alarm.hfa

    r38de914 r55b060d  
    1010// Created On       : Fri Jun 2 11:31:25 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Mar 26 16:25:41 2018
    13 // Update Count     : 11
     12// Last Modified On : Wed Aug 30 21:27:40 2023
     13// Update Count     : 12
    1414//
    1515
    … …  
    2323#include "time.hfa"
    2424
    25 #include "containers/list.hfa"
     25#include "collections/list.hfa"
    2626
    2727struct thread$;

  • libcfa/src/concurrency/invoke.h

    r38de914 r55b060d  
    1010// Created On       : Tue Jan 17 12:27:26 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Mar 14 13:39:31 2023
    13 // Update Count     : 59
     12// Last Modified On : Wed Aug 30 21:27:51 2023
     13// Update Count     : 60
    1414//
    1515
    1616// No not use #pragma once was this file is included twice in some places. It has its own guard system.
    1717
    18 #include "bits/containers.hfa"
     18#include "bits/collections.hfa"
    1919#include "bits/defs.hfa"
    2020#include "bits/locks.hfa"
    … …  
    2323
    2424#ifdef __cforall
    25 #include "containers/list.hfa"
     25#include "collections/list.hfa"
    2626extern "C" {
    2727#endif

  • libcfa/src/concurrency/kernel.hfa

    r38de914 r55b060d  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Feb  4 12:29:26 2020
    13 // Update Count     : 22
     12// Last Modified On : Wed Aug 30 21:28:46 2023
     13// Update Count     : 23
    1414//
    1515
    … …  
    2020#include "coroutine.hfa"
    2121
    22 #include "containers/list.hfa"
     22#include "collections/list.hfa"
    2323
    2424extern "C" {

  • libcfa/src/concurrency/locks.hfa

    r38de914 r55b060d  
    2121
    2222#include "bits/weakso_locks.hfa"
    23 #include "containers/lockfree.hfa"
    24 #include "containers/list.hfa"
     23#include "collections/lockfree.hfa"
     24#include "collections/list.hfa"
    2525
    2626#include "limits.hfa"

  • libcfa/src/concurrency/once.hfa

    r38de914 r55b060d  
    1616#pragma once
    1717
    18 #include "containers/lockfree.hfa"
     18#include "collections/lockfree.hfa"
    1919#include "kernel/fwd.hfa"
    2020

  • libcfa/src/concurrency/select.hfa

    r38de914 r55b060d  
    1717#pragma once
    1818
    19 #include "containers/list.hfa"
     19#include "collections/list.hfa"
    2020#include "alarm.hfa"
    2121#include "kernel.hfa"

  • libcfa/src/executor.baseline.txt

    r38de914 r55b060d  
    55
    66#include <thread.hfa>
    7 #include <containers/list.hfa>
     7#include <collections/list.hfa>
    88
    99forall( T & | $dlistable(T, T) ) {

  • libcfa/src/executor.cfa

    r38de914 r55b060d  
    55
    66#include <thread.hfa>
    7 #include <containers/list.hfa>
     7#include <collections/list.hfa>
    88
    99forall( T &, TLink& = dlink(T) | embedded(T, TLink, dlink(T)) ) {

  • tests/array-container/array-basic.cfa

    r38de914 r55b060d  
    1 #include <containers/array.hfa>
     1#include <collections/array.hfa>
    22
    33//

  • tests/array-container/array-md-sbscr-cases.cfa

    r38de914 r55b060d  
    1 #include <containers/array.hfa>
     1#include <collections/array.hfa>
    22
    33#include <assert.h>

  • tests/array-container/array-sbscr-types.cfa

    r38de914 r55b060d  
    1 #include <containers/array.hfa>
     1#include <collections/array.hfa>
    22
    33// Shows support for many required ways a user can index into a new array.

  • tests/array-container/dimexpr-match-cfa.cfa

    r38de914 r55b060d  
    99#ifdef INCLUDE_MINIMAL
    1010#define POUNDINCLUDE #include
    11 POUNDINCLUDE <containers/array.hfa>
     11POUNDINCLUDE <collections/array.hfa>
    1212#else
    13 #include <containers/array.hfa>                           // part of SUT
     13#include <collections/array.hfa>                                                // part of SUT
    1414#endif
    1515
    16 #include "dimexpr-match.hfa"                              // test framework
     16#include "dimexpr-match.hfa"                                                    // test framework
    1717
    1818// CFA "classic" behaviour is inconsistent between "C array" and "new array."

  • tests/array-container/safety-summary.cfa

    r38de914 r55b060d  
    11// A simple, isolated, example of what the dimexpr-match cases are all about.
    22
    3 #include <containers/array.hfa>
     3#include <collections/array.hfa>
    44
    55// context excerpted from doc/theses/mike_brooks_MMath/programs/hello-array.cfa

  • tests/collections/atomic_mpsc.cfa

    r38de914 r55b060d  
    11#include <fstream.hfa>
    2 #include <containers/lockfree.hfa>
     2#include <collections/lockfree.hfa>
    33#include <thread.hfa>
    44

  • tests/collections/string-api-coverage.cfa

    r38de914 r55b060d  
    1 #include <containers/string.hfa>
     1#include <collections/string.hfa>
    22#include <string_sharectx.hfa>
    33

  • tests/collections/string-istream.cfa

    r38de914 r55b060d  
    11#include <iostream.hfa>
    2 #include <containers/string.hfa>
    3 #include <containers/string_res.hfa>
     2#include <collections/string.hfa>
     3#include <collections/string_res.hfa>
    44
    55

  • tests/collections/string-overwrite.cfa

    r38de914 r55b060d  
    1 #include <containers/string.hfa>
     1#include <collections/string.hfa>
    22#include <string_sharectx.hfa>
    33

  • tests/collections/vector-demo.cfa

    r38de914 r55b060d  
    1 #include <containers/vector2.hfa>
     1#include <collections/vector2.hfa>
    22
    33void raiiTests() {

  • tests/concurrency/unified_locking/thread_test.cfa

    r38de914 r55b060d  
    33#include <stdlib.hfa>
    44#include <thread.hfa>
    5 #include <containers/array.hfa>
     5#include <collections/array.hfa>
    66
    77static unsigned int taskCount = 4;

  • tests/include/vector-containers.cfa

    r38de914 r55b060d  
    11#include <vector.hfa>
    2 #include <bits/containers.hfa>
     2#include <bits/collections.hfa>
    33
    44int main() {

  • tests/list/dlist-insert-remove.cfa

    r38de914 r55b060d  
    1 #include <containers/list.hfa>
     1#include <collections/list.hfa>
    22#include <fstream.hfa>
    33#include <assert.h>

  • tests/maybe.cfa

    r38de914 r55b060d  
    1010// Created On       : Thr May 25 16:02:00 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Sep 25 15:13:28 2020
    13 // Update Count     : 2
     12// Last Modified On : Wed Aug 30 21:45:27 2023
     13// Update Count     : 3
    1414//
    1515
    1616#include <assert.h>
    17 #include <containers/maybe.hfa>
     17#include <collections/maybe.hfa>
    1818
    1919void checkPredicates() {

  • tests/result.cfa

    r38de914 r55b060d  
    1010// Created On       : Thr May 25 16:50:00 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Sep 25 15:22:59 2020
    13 // Update Count     : 2
     12// Last Modified On : Wed Aug 30 21:46:34 2023
     13// Update Count     : 3
    1414//
    1515
    1616#include <assert.h>
    17 #include <containers/result.hfa>
     17#include <collections/result.hfa>
    1818
    1919void checkPredicates() {

  • tests/zombies/gc_no_raii/premake4.lua

    r38de914 r55b060d  
    4848                linkoptions (linkOptionList)
    4949                includedirs (includeDirList)
    50                 files { "src/**.c", "containers/**.c" }
     50                files { "src/**.c", "collections/**.c" }
    5151
    5252        configuration "debug"

  • tests/zombies/hashtable.cfa

    r38de914 r55b060d  
    11
    2 #include <containers/list.hfa>
     2#include <collections/list.hfa>
    33
    44#include <exception.hfa>

  • tests/zombies/hashtable2.cfa

    r38de914 r55b060d  
    11
    2 #include <containers/list.hfa>
     2#include <collections/list.hfa>
    33
    44typedef unsigned int K;

  • tests/zombies/linked-list-perf/experiment.koad

    r38de914 r55b060d  
    6767#elif defined IMPL_CFA_MIKE_NEW
    6868
    69         #include <containers/list.hfa>
     69        #include <collections/list.hfa>
    7070        struct S {
    7171                int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD
Note: See TracChangeset for help on using the changeset viewer.