Changeset 0376da9


Ignore:
Timestamp:
Jul 10, 2020, 12:59:46 PM (15 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
59f74a2, ab44413
Parents:
2fc94ced (diff), fb98462 (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

    r2fc94ced r0376da9  
    216216                        // adjust the size according to the parameters
    217217                        if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
    218                                 cq->ring_sz = sq->ring_sz = max(cq->ring_sz, sq->ring_sz);
     218                                cq.ring_sz = sq.ring_sz = max(cq.ring_sz, sq.ring_sz);
    219219                        }
    220220                #endif
     
    230230                        // mmap the Completion Queue into existence (may or may not be needed)
    231231                        if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
    232                                 cq->ring_ptr = sq->ring_ptr;
     232                                cq.ring_ptr = sq.ring_ptr;
    233233                        }
    234234                        else
     
    440440        static [int, bool] __drain_io( & struct __io_data ring, * sigset_t mask, int waitcnt, bool in_kernel ) {
    441441                /* paranoid */ verify( !kernelTLS.preemption_state.enabled );
    442                 const uint32_t smask = *ring.submit_q.mask;
    443442
    444443                unsigned to_submit = 0;
Note: See TracChangeset for help on using the changeset viewer.