Ignore:
Timestamp:
May 5, 2020, 10:51:15 AM (18 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
b6f2b21
Parents:
61dd73d (diff), d3ab183 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/io.cfa

    r61dd73d rf90d10f  
    2020
    2121#if !defined(HAVE_LINUX_IO_URING_H)
    22         void __kernel_io_startup( cluster & ) {
     22        void __kernel_io_startup( cluster &, bool ) {
    2323                // Nothing to do without io_uring
    2424        }
    2525
    26         void __kernel_io_start_thrd( cluster & ) {
     26        void __kernel_io_finish_start( cluster & ) {
    2727                // Nothing to do without io_uring
    2828        }
    2929
    30         void __kernel_io_stop_thrd ( cluster & ) {
     30        void __kernel_io_prepare_stop( cluster & ) {
    3131                // Nothing to do without io_uring
    3232        }
    3333
    34         void __kernel_io_shutdown( cluster & ) {
     34        void __kernel_io_shutdown( cluster &, bool ) {
    3535                // Nothing to do without io_uring
    3636        }
     
    695695        extern int close(int fd);
    696696
    697         struct statx;
    698         extern int statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf);
    699 
    700697        extern ssize_t read (int fd, void *buf, size_t count);
    701698}
     
    907904
    908905                (*sqe){ IORING_OP_CLOSE, fd };
    909 
    910                 __submit_wait
    911         #endif
    912 }
    913 
    914 int cfa_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) {
    915         #if !defined(HAVE_LINUX_IO_URING_H) || !defined(IORING_OP_STATX)
    916                 //return statx( dirfd, pathname, flags, mask, statxbuf );
    917                 return syscall( __NR_statx, dirfd, pathname, flags, mask, statxbuf );
    918         #else
    919                 __submit_prelude
    920 
    921                 (*sqe){ IORING_OP_STATX, dirfd };
    922                 sqe->addr = (uint64_t)pathname;
    923                 sqe->statx_flags = flags;
    924                 sqe->len = mask;
    925                 sqe->off = (uint64_t)statxbuf;
    926906
    927907                __submit_wait
     
    10401020                        return IS_DEFINED(IORING_OP_CLOSE);
    10411021
    1042                 if( /*func == (fptr_t)statx || */
    1043                         func == (fptr_t)cfa_statx )
    1044                         #define _CFA_IO_FEATURE_IORING_OP_STATX ,
    1045                         return IS_DEFINED(IORING_OP_STATX);
    1046 
    10471022                if( /*func == (fptr_t)read || */
    10481023                        func == (fptr_t)cfa_read )
Note: See TracChangeset for help on using the changeset viewer.