Changes in / [e2702fd:92aca37]


Ignore:
Files:
43 added
3 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    re2702fd r92aca37  
    44
    55# generated by configure
    6 aclocal.m4
    7 automake
    86autom4te.cache
    97config.h
     
    119config.log
    1210config.py
    13 configure
     11stamp-h1
    1412libtool
    15 stamp-h1
    1613/Makefile
    17 /Makefile.in
    1814**/Makefile
    19 **/Makefile.in
    2015/version
    2116
  • Jenkinsfile

    re2702fd r92aca37  
    114114        release = Settings.RunAllTests || Settings.RunBenchmark
    115115        build_stage('Build : configure', true) {
    116                 // Configure must be run inside the tree
    117                 dir (SrcDir) {
    118                         // Generate the necessary build files
    119                         sh './autogen.sh'
    120                 }
    121 
    122116                // Build outside of the src tree to ease cleaning
    123117                dir (BuildDir) {
  • benchmark/Makefile.am

    re2702fd r92aca37  
    1919
    2020# applies to both programs
    21 include $(top_srcdir)/tools/build/cfa.make
     21include $(top_srcdir)/src/cfa.make
    2222
    2323AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
  • configure.ac

    re2702fd r92aca37  
    66AC_CONFIG_AUX_DIR([automake])
    77AC_CONFIG_MACRO_DIRS([automake])
     8#AC_CONFIG_SRCDIR([src/main.cc])
    89AC_CONFIG_HEADERS([config.h:src/config.h.in])
    910AM_SILENT_RULES([yes])
    1011
    11 m4_include([tools/build/cfa.m4])
     12m4_include([automake/cfa.m4])
    1213
    1314# don't use the default CFLAGS as they unconditonnaly add -O2
  • libcfa/configure.ac

    re2702fd r92aca37  
    88AM_SILENT_RULES([yes])
    99
    10 m4_include([../tools/build/cfa.m4])
     10m4_include([../automake/cfa.m4])
    1111
    1212AM_INIT_AUTOMAKE([subdir-objects])
  • libcfa/prelude/defines.hfa.in

    re2702fd r92aca37  
    1 /* prelude/defines.hfa.in.  Generated from configure.ac by autoheader.  */
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// defines.hfa.in --
     8//
     9// Author           : Thierry Delisle
     10// Created On       : Thu Apr 30 15:23:00 2020
     11// Last Modified By :
     12// Last Modified On :
     13// Update Count     :
     14//
    215
    3 /* Location of cfa command. */
    4 #undef CFA_BINDIR
     16//-----------------------------------------------------------------------
     17// Global Support
     18/* Defined if io_uring support is present when compiling libcfathread. */
     19#undef CFA_HAVE_LINUX_IO_URING_H
     20
     21//-----------------------------------------------------------------------
     22// Operations
     23/* Defined if io_uring support is present when compiling libcfathread and
     24   supports the operation IORING_OP_NOP. */
     25#undef CFA_HAVE_IORING_OP_NOP
     26
     27/* Defined if io_uring support is present when compiling libcfathread and
     28   supports the operation IORING_OP_READV. */
     29#undef CFA_HAVE_IORING_OP_READV
     30
     31/* Defined if io_uring support is present when compiling libcfathread and
     32   supports the operation IORING_OP_WRITEV. */
     33#undef CFA_HAVE_IORING_OP_WRITEV
     34
     35/* Defined if io_uring support is present when compiling libcfathread and
     36   supports the operation IORING_OP_FSYNC. */
     37#undef CFA_HAVE_IORING_OP_FSYNC
     38
     39/* Defined if io_uring support is present when compiling libcfathread and
     40   supports the operation IORING_OP_READ_FIXED. */
     41#undef CFA_HAVE_IORING_OP_READ_FIXED
     42
     43/* Defined if io_uring support is present when compiling libcfathread and
     44   supports the operation IORING_OP_WRITE_FIXED. */
     45#undef CFA_HAVE_IORING_OP_WRITE_FIXED
     46
     47/* Defined if io_uring support is present when compiling libcfathread and
     48   supports the operation IORING_OP_POLL_ADD. */
     49#undef CFA_HAVE_IORING_OP_POLL_ADD
     50
     51/* Defined if io_uring support is present when compiling libcfathread and
     52   supports the operation IORING_OP_POLL_REMOVE. */
     53#undef CFA_HAVE_IORING_OP_POLL_REMOVE
     54
     55/* Defined if io_uring support is present when compiling libcfathread and
     56   supports the operation IORING_OP_SYNC_FILE_RANGE. */
     57#undef CFA_HAVE_IORING_OP_SYNC_FILE_RANGE
     58
     59/* Defined if io_uring support is present when compiling libcfathread and
     60   supports the operation IORING_OP_SENDMSG. */
     61#undef CFA_HAVE_IORING_OP_SENDMSG
     62
     63/* Defined if io_uring support is present when compiling libcfathread and
     64   supports the operation IORING_OP_RECVMSG. */
     65#undef CFA_HAVE_IORING_OP_RECVMSG
     66
     67/* Defined if io_uring support is present when compiling libcfathread and
     68   supports the operation IORING_OP_TIMEOUT. */
     69#undef CFA_HAVE_IORING_OP_TIMEOUT
     70
     71/* Defined if io_uring support is present when compiling libcfathread and
     72   supports the operation IORING_OP_TIMEOUT_REMOVE. */
     73#undef CFA_HAVE_IORING_OP_TIMEOUT_REMOVE
    574
    675/* Defined if io_uring support is present when compiling libcfathread and
     
    1382
    1483/* Defined if io_uring support is present when compiling libcfathread and
    15    supports the operation IORING_OP_CLOSE. */
    16 #undef CFA_HAVE_IORING_OP_CLOSE
     84   supports the operation IORING_OP_LINK_TIMEOUT. */
     85#undef CFA_HAVE_IORING_OP_LINK_TIMEOUT
    1786
    1887/* Defined if io_uring support is present when compiling libcfathread and
     
    2190
    2291/* Defined if io_uring support is present when compiling libcfathread and
    23    supports the operation IORING_OP_EPOLL_CTL. */
    24 #undef CFA_HAVE_IORING_OP_EPOLL_CTL
     92   supports the operation IORING_OP_FALLOCATE. */
     93#undef CFA_HAVE_IORING_OP_FALLOCATE
     94
     95/* Defined if io_uring support is present when compiling libcfathread and
     96   supports the operation IORING_OP_OPENAT. */
     97#undef CFA_HAVE_IORING_OP_OPENAT
     98
     99/* Defined if io_uring support is present when compiling libcfathread and
     100   supports the operation IORING_OP_CLOSE. */
     101#undef CFA_HAVE_IORING_OP_CLOSE
     102
     103/* Defined if io_uring support is present when compiling libcfathread and
     104   supports the operation IORING_OP_FILES_UPDATE. */
     105#undef CFA_HAVE_IORING_OP_FILES_UPDATE
     106
     107/* Defined if io_uring support is present when compiling libcfathread and
     108   supports the operation IORING_OP_STATX. */
     109#undef CFA_HAVE_IORING_OP_STATX
     110
     111/* Defined if io_uring support is present when compiling libcfathread and
     112   supports the operation IORING_OP_READ. */
     113#undef CFA_HAVE_IORING_OP_READ
     114
     115/* Defined if io_uring support is present when compiling libcfathread and
     116   supports the operation IORING_OP_WRITE. */
     117#undef CFA_HAVE_IORING_OP_WRITE
    25118
    26119/* Defined if io_uring support is present when compiling libcfathread and
     
    29122
    30123/* Defined if io_uring support is present when compiling libcfathread and
    31    supports the operation IORING_OP_FALLOCATE. */
    32 #undef CFA_HAVE_IORING_OP_FALLOCATE
    33 
    34 /* Defined if io_uring support is present when compiling libcfathread and
    35    supports the operation IORING_OP_FILES_UPDATE. */
    36 #undef CFA_HAVE_IORING_OP_FILES_UPDATE
    37 
    38 /* Defined if io_uring support is present when compiling libcfathread and
    39    supports the operation IORING_OP_FSYNC. */
    40 #undef CFA_HAVE_IORING_OP_FSYNC
    41 
    42 /* Defined if io_uring support is present when compiling libcfathread and
    43    supports the operation IORING_OP_LINK_TIMEOUT. */
    44 #undef CFA_HAVE_IORING_OP_LINK_TIMEOUT
    45 
    46 /* Defined if io_uring support is present when compiling libcfathread and
    47124   supports the operation IORING_OP_MADVISE. */
    48125#undef CFA_HAVE_IORING_OP_MADVISE
    49126
    50127/* Defined if io_uring support is present when compiling libcfathread and
    51    supports the operation IORING_OP_NOP. */
    52 #undef CFA_HAVE_IORING_OP_NOP
     128   supports the operation IORING_OP_SEND. */
     129#undef CFA_HAVE_IORING_OP_SEND
    53130
    54131/* Defined if io_uring support is present when compiling libcfathread and
    55    supports the operation IORING_OP_OPENAT. */
    56 #undef CFA_HAVE_IORING_OP_OPENAT
     132   supports the operation IORING_OP_RECV. */
     133#undef CFA_HAVE_IORING_OP_RECV
    57134
    58135/* Defined if io_uring support is present when compiling libcfathread and
     
    61138
    62139/* Defined if io_uring support is present when compiling libcfathread and
    63    supports the operation IORING_OP_POLL_ADD. */
    64 #undef CFA_HAVE_IORING_OP_POLL_ADD
     140   supports the operation IORING_OP_EPOLL_CTL. */
     141#undef CFA_HAVE_IORING_OP_EPOLL_CTL
    65142
    66143/* Defined if io_uring support is present when compiling libcfathread and
    67    supports the operation IORING_OP_POLL_REMOVE. */
    68 #undef CFA_HAVE_IORING_OP_POLL_REMOVE
     144   supports the operation IORING_OP_SPLICE. */
     145#undef CFA_HAVE_IORING_OP_SPLICE
    69146
    70147/* Defined if io_uring support is present when compiling libcfathread and
     
    73150
    74151/* Defined if io_uring support is present when compiling libcfathread and
    75    supports the operation IORING_OP_READ. */
    76 #undef CFA_HAVE_IORING_OP_READ
    77 
    78 /* Defined if io_uring support is present when compiling libcfathread and
    79    supports the operation IORING_OP_READV. */
    80 #undef CFA_HAVE_IORING_OP_READV
    81 
    82 /* Defined if io_uring support is present when compiling libcfathread and
    83    supports the operation IORING_OP_READ_FIXED. */
    84 #undef CFA_HAVE_IORING_OP_READ_FIXED
    85 
    86 /* Defined if io_uring support is present when compiling libcfathread and
    87    supports the operation IORING_OP_RECV. */
    88 #undef CFA_HAVE_IORING_OP_RECV
    89 
    90 /* Defined if io_uring support is present when compiling libcfathread and
    91    supports the operation IORING_OP_RECVMSG. */
    92 #undef CFA_HAVE_IORING_OP_RECVMSG
    93 
    94 /* Defined if io_uring support is present when compiling libcfathread and
    95152   supports the operation IORING_OP_REMOVE_BUFFER. */
    96153#undef CFA_HAVE_IORING_OP_REMOVE_BUFFER
    97154
    98 /* Defined if io_uring support is present when compiling libcfathread and
    99    supports the operation IORING_OP_SEND. */
    100 #undef CFA_HAVE_IORING_OP_SEND
    101 
    102 /* Defined if io_uring support is present when compiling libcfathread and
    103    supports the operation IORING_OP_SENDMSG. */
    104 #undef CFA_HAVE_IORING_OP_SENDMSG
    105 
    106 /* Defined if io_uring support is present when compiling libcfathread and
    107    supports the operation IORING_OP_SPLICE. */
    108 #undef CFA_HAVE_IORING_OP_SPLICE
    109 
    110 /* Defined if io_uring support is present when compiling libcfathread and
    111    supports the operation IORING_OP_STATX. */
    112 #undef CFA_HAVE_IORING_OP_STATX
    113 
    114 /* Defined if io_uring support is present when compiling libcfathread and
    115    supports the operation IORING_OP_SYNC_FILE_RANGE. */
    116 #undef CFA_HAVE_IORING_OP_SYNC_FILE_RANGE
    117 
    118 /* Defined if io_uring support is present when compiling libcfathread and
    119    supports the operation IORING_OP_TIMEOUT. */
    120 #undef CFA_HAVE_IORING_OP_TIMEOUT
    121 
    122 /* Defined if io_uring support is present when compiling libcfathread and
    123    supports the operation IORING_OP_TIMEOUT_REMOVE. */
    124 #undef CFA_HAVE_IORING_OP_TIMEOUT_REMOVE
    125 
    126 /* Defined if io_uring support is present when compiling libcfathread and
    127    supports the operation IORING_OP_WRITE. */
    128 #undef CFA_HAVE_IORING_OP_WRITE
    129 
    130 /* Defined if io_uring support is present when compiling libcfathread and
    131    supports the operation IORING_OP_WRITEV. */
    132 #undef CFA_HAVE_IORING_OP_WRITEV
    133 
    134 /* Defined if io_uring support is present when compiling libcfathread and
    135    supports the operation IORING_OP_WRITE_FIXED. */
    136 #undef CFA_HAVE_IORING_OP_WRITE_FIXED
    137 
    138 /* Defined if io_uring support is present when compiling libcfathread and
    139    supports the flag ASYNC. */
    140 #undef CFA_HAVE_IOSQE_ASYNC
    141 
     155//-----------------------------------------------------------------------
     156// Flags
    142157/* Defined if io_uring support is present when compiling libcfathread and
    143158   supports the flag FIXED_FILE. */
     
    149164
    150165/* Defined if io_uring support is present when compiling libcfathread and
    151    supports the flag IO_HARDLINK. */
    152 #undef CFA_HAVE_IOSQE_IO_HARDLINK
     166   supports the flag ASYNC. */
     167#undef CFA_HAVE_IOSQE_ASYNC
    153168
    154169/* Defined if io_uring support is present when compiling libcfathread and
     
    156171#undef CFA_HAVE_IOSQE_IO_LINK
    157172
    158 /* Defined if io_uring support is present when compiling libcfathread. */
    159 #undef CFA_HAVE_LINUX_IO_URING_H
     173/* Defined if io_uring support is present when compiling libcfathread and
     174   supports the flag IO_HARDLINK. */
     175#undef CFA_HAVE_IOSQE_IO_HARDLINK
    160176
    161177/* Defined if io_uring support is present when compiling libcfathread and
     
    163179#undef CFA_HAVE_SPLICE_F_FD_IN_FIXED
    164180
    165 /* Location of include files. */
    166 #undef CFA_INCDIR
    167 
    168 /* Location of cc1 and cfa-cpp commands. */
    169 #undef CFA_LIBDIR
    170 
    171 /* Location of cfa install. */
    172 #undef CFA_PREFIX
    173 
    174 /* Define to 1 if you have the <dlfcn.h> header file. */
    175 #undef HAVE_DLFCN_H
    176 
    177 /* Define to 1 if you have the <inttypes.h> header file. */
    178 #undef HAVE_INTTYPES_H
    179 
    180 /* Define to 1 if you have the <linux/io_uring.h> header file. */
    181 #undef HAVE_LINUX_IO_URING_H
    182 
    183 /* Define to 1 if you have the <memory.h> header file. */
    184 #undef HAVE_MEMORY_H
    185 
     181//-----------------------------------------------------------------------
     182// Other calls
    186183/* Define to 1 if you have the `preadv2' function. */
    187184#undef HAVE_PREADV2
     
    190187#undef HAVE_PWRITEV2
    191188
    192 /* Define to 1 if you have the <stdint.h> header file. */
    193 #undef HAVE_STDINT_H
    194 
    195 /* Define to 1 if you have the <stdlib.h> header file. */
    196 #undef HAVE_STDLIB_H
    197 
    198 /* Define to 1 if you have the <strings.h> header file. */
    199 #undef HAVE_STRINGS_H
    200 
    201 /* Define to 1 if you have the <string.h> header file. */
    202 #undef HAVE_STRING_H
    203 
    204 /* Define to 1 if you have the <sys/stat.h> header file. */
    205 #undef HAVE_SYS_STAT_H
    206 
    207 /* Define to 1 if you have the <sys/types.h> header file. */
    208 #undef HAVE_SYS_TYPES_H
    209 
    210 /* Define to 1 if you have the <unistd.h> header file. */
    211 #undef HAVE_UNISTD_H
    212 
    213 /* Define to the sub-directory where libtool stores uninstalled libraries. */
    214 #undef LT_OBJDIR
    215 
    216 /* Name of package */
    217 #undef PACKAGE
    218 
    219 /* Define to the address where bug reports for this package should be sent. */
    220 #undef PACKAGE_BUGREPORT
    221 
    222 /* Define to the full name of this package. */
    223 #undef PACKAGE_NAME
    224 
    225 /* Define to the full name and version of this package. */
    226 #undef PACKAGE_STRING
    227 
    228 /* Define to the one symbol short name of this package. */
    229 #undef PACKAGE_TARNAME
    230 
    231 /* Define to the home page for this package. */
    232 #undef PACKAGE_URL
    233 
    234 /* Define to the version of this package. */
    235 #undef PACKAGE_VERSION
    236 
    237 /* Define to 1 if you have the ANSI C header files. */
    238 #undef STDC_HEADERS
    239 
    240 /* Version number of package */
    241 #undef VERSION
    242 
     189//-----------------------------------------------------------------------
     190// Statistics
    243191/* Defined if libcfathread was compiled without support for statistics. */
    244192#undef __CFA_NO_STATISTICS__
  • libcfa/src/Makefile.am

    re2702fd r92aca37  
    1919ACLOCAL_AMFLAGS  = -I automake
    2020
    21 include $(top_srcdir)/../tools/build/cfa.make
     21include $(srcdir)/../../src/cfa.make
    2222
    2323libdir = ${CFA_LIBDIR}
  • longrun_tests/Makefile.am

    re2702fd r92aca37  
    1818ACLOCAL_AMFLAGS  = -I automake
    1919
    20 include $(top_srcdir)/tools/build/cfa.make
     20include $(top_srcdir)/src/cfa.make
    2121
    2222repeats=10
  • tests/Makefile.am

    re2702fd r92aca37  
    1818ACLOCAL_AMFLAGS  = -I automake
    1919
    20 include $(top_srcdir)/tools/build/cfa.make
     20include $(top_srcdir)/src/cfa.make
    2121
    2222DEFAULT_INCLUDES = -I${abs_srcdir}
Note: See TracChangeset for help on using the changeset viewer.