Diff [3b40233941d2ef8811b554e1e45b8d28fe6eb75d:144fa5cf42246c8b56b56e43f007e6ecef477101] for / – Cforall

benchmark/io/http/http_ring.cpp

-              r3b402339
+              r144fa5c
 #include <liburing.h>
+// #define NOBATCHING
+// #define USE_ASYNC
+// Options passed to each threads
+typedef enum {
+        EVENT_END,
+        EVENT_ACCEPT,
+        EVENT_REQUEST,
+        EVENT_ANSWER
+} event_t;
+struct __attribute__((aligned(128))) request_t {
+        event_t type;
+        int fd;
+        size_t length;
+        char * buff;
+        char data[0];
+        static struct request_t * create(event_t type, size_t extra) {
+                auto ret = (struct request_t *)malloc(sizeof(struct request_t) + extra);
+                ret->type = type;
+                ret->length = extra;
+                ret->buff = ret->data;
+                return ret;
+        }
+        static struct request_t * create(event_t type) {
+                return create(type, 0);
+        }
+};
 struct __attribute__((aligned(128))) options_t {
-        // Data passed to accept
         struct {
                 int sockfd;
 …
         } acpt;
-        // Termination notification
         int endfd;
-        // The ring to use for io
         struct io_uring * ring;
+        struct {
+                size_t subs = 0;
+                size_t cnts = 0;
+        } result;
 };
 //=========================================================
-// General statistics
-struct __attribute__((aligned(128))) stats_block_t {
-        struct {
-                volatile size_t conns = 0;
-                volatile size_t reads = 0;
-                volatile size_t writes = 0;
-                volatile size_t full_writes = 0;
-        } completions;
-        struct {
-                volatile size_t conns = 0;
-                struct {
-                        volatile size_t pipes = 0;
-                        volatile size_t reset = 0;
-                        volatile size_t other = 0;
-                } requests;
-                struct {
-                        volatile size_t pipes = 0;
-                        volatile size_t reset = 0;
-                        volatile size_t other = 0;
-                } answers;
-        } errors;
-        struct {
-                volatile size_t current = 0;
-                volatile size_t max = 0;
-                volatile size_t used = 0;
-        } conns;
-        volatile size_t recycle_errors = 0;
-};
-// Each thread gets its own block of stats
-// and there is a global block for tallying at the end
-thread_local stats_block_t stats;
-stats_block_t global_stats;
-// Get an array of current connections
-// This is just for debugging, to make sure
-// no two state-machines get the same fd
-const size_t array_max = 25000;
-class connection * volatile conns[array_max] = { 0 };
-// Max fd we've seen, keep track so it's convenient to adjust the array size after
-volatile int max_fd = 0;
-//=========================================================
-// Some small wrappers for ring operations used outside the connection state machine
-// get sqe + error handling
 static struct io_uring_sqe * get_sqe(struct io_uring * ring) {
         struct io_uring_sqe * sqe = io_uring_get_sqe(ring);
 …
+}
+// read of the event fd is not done by a connection
+// use nullptr as the user data
+static void submit(struct io_uring * ) {
+        // io_uring_submit(ring);
+}
+//=========================================================
 static void ring_end(struct io_uring * ring, int fd, char * buffer, size_t len) {
         struct io_uring_sqe * sqe = get_sqe(ring);
         io_uring_prep_read(sqe, fd, buffer, len, 0);
+        io_uring_sqe_set_data(sqe, nullptr);
+        io_uring_submit(ring);
+        io_uring_sqe_set_data(sqe, request_t::create(EVENT_END));
+        submit(ring);
+}
+static void ring_accept(struct io_uring * ring, int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) {
+        auto req = request_t::create(EVENT_ACCEPT);
+        struct io_uring_sqe * sqe = get_sqe(ring);
+        io_uring_prep_accept(sqe, sockfd, addr, addrlen, flags);
+        io_uring_sqe_set_data(sqe, req);
+        submit(ring);
+        // std::cout << "Submitted accept: " << req << std::endl;
+}
+static void ring_request(struct io_uring * ring, int fd) {
+        size_t size = 1024;
+        auto req = request_t::create(EVENT_REQUEST, size);
+        req->fd = fd;
+        struct io_uring_sqe * sqe = get_sqe(ring);
+        io_uring_prep_read(sqe, fd, req->buff, size, 0);
+        io_uring_sqe_set_data(sqe, req);
+        submit(ring);
+        // std::cout << "Submitted request: " << req << " (" << (void*)req->buffer << ")"<<std::endl;
+}
 //=========================================================
-// All answers are fixed and determined by the return code
 enum HttpCode {
         OK200 = 0,
 …
 };
-// Get a fix reply based on the return code
 const char * http_msgs[] = {
         "HTTP/1.1 200 OK\r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 15\r\nConnection: keep-alive\r\n\r\nHello, World!\r\n",
         "HTTP/1.1 400 Bad Request\r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 0 \r\n\r\n",
         "HTTP/1.1 404 Not Found\r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 0 \r\n\r\n",
         "HTTP/1.1 405 Method Not \r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 0 \r\n\r\n",
         "HTTP/1.1 408 Request Timeout\r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 0 \r\n\r\n",
         "HTTP/1.1 413 Payload Too Large\r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 0 \r\n\r\n",
         "HTTP/1.1 414 URI Too Long\r\nServer: HttoForall\r\nContent-Type: text/plain\r\nContent-Length: 0 \r\n\r\n",
+        "HTTP/1.1 200 OK\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: %zu \n\n%s",
+        "HTTP/1.1 400 Bad Request\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 404 Not Found\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 405 Method Not Allowed\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 408 Request Timeout\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 413 Payload Too Large\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 414 URI Too Long\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
 };
+static_assert( KNOWN_CODES == (sizeof(http_msgs) / sizeof(http_msgs[0])) );
+// Pre-compute the length of these replys
 const size_t http_lens[] = {
         strlen(http_msgs[0]),
         strlen(http_msgs[1]),
         strlen(http_msgs[2]),
         strlen(http_msgs[3]),
         strlen(http_msgs[4]),
         strlen(http_msgs[5]),
         strlen(http_msgs[6]),
+static_assert( KNOWN_CODES == (sizeof(http_msgs ) / sizeof(http_msgs [0])));
+const int http_codes[] = {
+,
+,
+,
+,
+,
+,
+,
 };
+static_assert( KNOWN_CODES == (sizeof(http_lens) / sizeof(http_lens[0])) );
+static_assert( KNOWN_CODES == (sizeof(http_codes) / sizeof(http_codes[0])));
+int code_val(HttpCode code) {
+        return http_codes[code];
+}
+static void ring_answer(struct io_uring * ring, int fd, HttpCode code) {
+        size_t size = 256;
+        auto req = request_t::create(EVENT_ANSWER, size);
+        req->fd = fd;
+        const char * fmt = http_msgs[code];
+        const char * date = "";
+        size = snprintf(req->buff, size, fmt, date, size);
+        struct io_uring_sqe * sqe = get_sqe(ring);
+        io_uring_prep_write(sqe, fd, req->buff, size, 0);
+        io_uring_sqe_set_data(sqe, req);
+        submit(ring);
+        // std::cout << "Submitted good answer: " << req << " (" << (void*)req->buffer << ")"<<std::endl;
+}
+static void ring_answer(struct io_uring * ring, int fd, const std::string &) {
+        // size_t size = 256;
+        // auto req = request_t::create(EVENT_ANSWER, size);
+        // req->fd = fd;
+        // const char * fmt = http_msgs[OK200];
+        // const char * date = "";
+        // size_t len = snprintf(req->buffer, size, fmt, date, ans.size(), ans.c_str());
+        // req->length = len;
+        // struct io_uring_sqe * sqe = get_sqe(ring);
+        // io_uring_prep_write(sqe, fd, req->buffer, len, 0);
+        // io_uring_sqe_set_data(sqe, req);
+        // submit(ring);
+        // std::cout << "Submitted good answer: " << req << " (" << (void*)req->buffer << ")"<<std::endl;
+        static const char* RESPONSE = "HTTP/1.1 200 OK\r\n" \
+                                                "Content-Length: 15\r\n" \
+                                                "Content-Type: text/html\r\n" \
+                                                "Connection: keep-alive\r\n" \
+                                                "Server: testserver\r\n" \
+                                                "\r\n" \
+                                                "Hello, World!\r\n";
+        static const size_t RLEN = strlen(RESPONSE);
+        size_t size = 256;
+        auto req = request_t::create(EVENT_ANSWER, size);
+        req->fd = fd;
+        req->buff = (char*)RESPONSE;
+        req->length = RLEN;
+        // const char * fmt = http_msgs[OK200];
+        // const char * date = "";
+        // size_t len = snprintf(req->buffer, size, fmt, date, ans.size(), ans.c_str());
+        // req->length = len;
+        struct io_uring_sqe * sqe = get_sqe(ring);
+        io_uring_prep_write(sqe, fd, RESPONSE, RLEN, 0);
+        io_uring_sqe_set_data(sqe, req);
+        submit(ring);
+}
 //=========================================================
+// Finate state machine responsible for handling each connection
+class __attribute__((aligned(128))) connection {
+private:
+        // The state of the machine
+        enum {
+                ACCEPTING,  // Accept sent waiting for connection
+                REQUESTING, // Waiting for new request
+                ANSWERING,  // Either request received submitting answer or short answer sent, need to submit rest
+        } state;
+        // The file descriptor of the connection
+        int fd;
+        // request data
+        static const size_t buffer_size = 1024; // Size of the read buffer
+        const char * buffer;                      // Buffer into which requests are read
+        // send data
+        size_t to_send;         // Data left to send
+        const char * iterator;  // Pointer to rest of the message to send
+        // stats
+        // how many requests/answers were complete, that is, a valid cqe was obtained
+        struct {
+                size_t requests = 0;
+                size_t answers = 0;
+        } stats;
+private:
+        connection()
+                : state(ACCEPTING)
+                , fd(0)
+                , buffer( new char[buffer_size])
+                , iterator(nullptr)
+        {}
+        ~connection() {
+                delete [] buffer;
+                ::stats.conns.current--;
+        }
+        // Close the current connection
+        void close(int err) {
+                // std::cout << "(" << this->stats.requests << "," << this->stats.answers << ", e" << err << ") ";
+                conns[fd] = nullptr;
+                if(fd != 0) {
+                        ::close(fd);
+                }
+                delete this;
+        }
+        //--------------------------------------------------
+        // Wrappers for submit so we can tweak it more easily
+        static void submit(struct io_uring * ring, struct io_uring_sqe * sqe, connection * conn) {
+                (void)ring;
+                #ifdef USE_ASYNC
+                        io_uring_sqe_set_flags(sqe, IOSQE_ASYNC);
+                #endif
+                io_uring_sqe_set_data(sqe, conn);
+                #ifdef NOBATCHING
+                        io_uring_submit(ring);
+                #endif
+        }
+        void submit(struct io_uring * ring, struct io_uring_sqe * sqe) {
+                submit(ring, sqe, this);
+        }
+        //--------------------------------------------------
+        // get a new request from the client
+        void request(struct io_uring * ring) {
+                state = REQUESTING;
+                struct io_uring_sqe * sqe = get_sqe(ring);
+                io_uring_prep_recv(sqe, fd, (void*)buffer, buffer_size, 0);
+                submit(ring, sqe);
+        }
+        //--------------------------------------------------
+        // Send a new answer based on a return code
+        void answer(struct io_uring * ring, HttpCode code) {
+                iterator = http_msgs[code];
+                to_send  = http_lens[code];
+                if(to_send != 124) {
+                        std::cerr << "Answer has weird size: " << to_send << " (" << (int)code << ")" << std::endl;
+                }
+                answer(ring);
+        }
+        // send a new answer to the client
+        // Reused for incomplete writes
+        void answer(struct io_uring * ring) {
+                state = ANSWERING;
+                struct io_uring_sqe * sqe = get_sqe(ring);
+                io_uring_prep_send(sqe, fd, iterator, to_send, 0);
+                submit(ring, sqe);
+        }
+        //--------------------------------------------------
+        // Handle a new connection, results for getting an cqe while in the ACCEPTING state
+        void newconn(struct io_uring * ring, int ret) {
+                // Check errors
+                if( ret < 0 ) {
+                        int err = -ret;
+                        if( err == ECONNABORTED ) {
+                                ::stats.errors.conns++;
+                                this->close(err);
+static void handle_new_conn(struct io_uring * ring, int fd) {
+        if( fd < 0 ) {
+                int err = -fd;
+                if( err == ECONNABORTED ) return;
+                std::cerr << "accept error: (" << errno << ") " << strerror(errno) << std::endl;
+                exit(EXIT_FAILURE);
+        }
+        ring_request(ring, fd);
+}
+static void handle_request(struct io_uring * ring, struct request_t * in, int res) {
+        if( res < 0 ) {
+                int err = -res;
+                switch(err) {
+                        case EPIPE:
+                        case ECONNRESET:
+                                close(in->fd);
+                                free(in);
                                 return;
+                        }
+                        std::cerr << "accept error: (" << errno << ") " << strerror(errno) << std::endl;
+                        exit(EXIT_FAILURE);
+                }
+                // Count the connections
+                ::stats.completions.conns++;
+                ::stats.conns.current++;
+                if(::stats.conns.current > ::stats.conns.max) {
+                        ::stats.conns.max = ::stats.conns.current;
+                }
+                // Read on the data
+                fd = ret;
+                request(ring);
+                // check the max fd so we know if we exceeded the array
+                for(;;) {
+                        int expected = max_fd;
+                        if(expected >= fd) return;
+                        if( __atomic_compare_exchange_n(&max_fd, &expected, fd, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ) return;
+                }
+                // check if we have enough space to fit inside the array
+                if(fd >= array_max) {
+                        std::cerr << "accept error: fd " << fd << " is too high" << std::endl;
+                        return;
+                }
+                // Put our connection into the global array
+                // No one else should be using it so if they are that's a bug
+                auto exist = __atomic_exchange_n( &conns[fd], this, __ATOMIC_SEQ_CST);
+                if( exist ) {
+                        size_t first = __atomic_fetch_add(&global_stats.recycle_errors, 1, __ATOMIC_SEQ_CST);
+                        if( first == 0 ) {
+                                std::cerr << "First: accept has existing connection " << std::endl;
+                        }
+                }
+        }
+        // Handle a new request, results for getting an cqe while in the REQUESTING state
+        void newrequest(struct io_uring * ring, int res) {
+                // Check errors
+                if( res < 0 ) {
+                        int err = -res;
+                        switch(err) {
+                                case EPIPE:
+                                        ::stats.errors.requests.pipes++;
+                                        break;
+                                        // Don't fall through the get better stats
+                                case ECONNRESET:
+                                        ::stats.errors.requests.reset++;
+                                        break;
+                                default:
+                                        ::stats.errors.requests.other++;
+                                        std::cerr << "request error: (" << err << ") " << strerror(err) << std::endl;
+                                        exit(EXIT_FAILURE);
+                        }
+                        // Connection failed, close it
+                        this->close(err);
+                        return;
+                }
+                // Update stats
+                ::stats.completions.reads++;
+                // Is this an EOF
+                if(res == 0) {
+                        // Yes, close the connection
+                        this->close(0);
+                        return;
+                }
+                // Find the end of the request header
+                const char * it = buffer;
+                if( !strstr( it, "\r\n\r\n" ) ) {
+                        // This state machine doesn't support incomplete reads
+                        // Print them to output so it's clear there is an issue
+                        std::cout << "Incomplete request" << std::endl;
+                        this->close(EBADR);
+                        return;
+                }
+                // Find the method to use
+                it = buffer;
+                int ret = memcmp(it, "GET ", 4);
+                if( ret != 0 ) {
+                        // We only support get, answer with an error
+                        answer(ring, E400);
+                        return;
+                }
+                // Find the target
+                it += 4;
+                ret = memcmp(it, "/plaintext", 10);
+                if( ret != 0 ) {
+                        // We only support /plaintext, answer with an error
+                        answer(ring, E404);
+                        return;
+                }
+                // Correct request, answer with the payload
+                this->stats.requests++;
+                answer(ring, OK200);
+        }
+        // Handle a partial or full answer sent, results for getting an cqe while in the ANSWERING state
+        void writedone(struct io_uring * ring, int res) {
+                // Check errors
+                if( res < 0 ) {
+                        int err = -res;
+                        switch(err) {
+                                case EPIPE:
+                                        ::stats.errors.answers.pipes++;
+                                        break;
+                                        // Don't fall through the get better stats
+                                case ECONNRESET:
+                                        ::stats.errors.answers.reset++;
+                                        break;
+                                default:
+                                        ::stats.errors.answers.other++;
+                                        std::cerr << "answer error: (" << err << ") " << strerror(err) << std::endl;
+                                        exit(EXIT_FAILURE);
+                        }
+                        this->close(err);
+                        return;
+                }
+                // Update stats
+                ::stats.completions.writes++;
+                if(res == 124) ::stats.completions.full_writes++;
+                // Is this write completed
+                if( res == to_send ) {
+                        // Yes, more stats
+                        this->stats.answers++;
+                        if(this->stats.answers == 1) ::stats.conns.used++;
+                        // Then read a new request
+                        request(ring);
+                        return;
+                }
+                // Not a completed read, push the rest
+                to_send -= res;
+                iterator += res;
+                answer(ring);
+        }
+public:
+        // Submit a call to accept and create a new connection object
+        static void accept(struct io_uring * ring, const struct options_t & opt) {
+                struct io_uring_sqe * sqe = get_sqe(ring);
+                io_uring_prep_accept(sqe, opt.acpt.sockfd, opt.acpt.addr, opt.acpt.addrlen, opt.acpt.flags);
+                submit(ring, sqe, new connection());
+                // std::cout << "Submitted accept: " << req << std::endl;
+        }
+        // Handle a new cqe
+        void handle(struct io_uring * ring, int res, const struct options_t & opt) {
+                switch(state) {
+                case ACCEPTING:
+                        connection::accept(ring, opt);
+                        newconn(ring, res);
+                        break;
+                case REQUESTING:
+                        newrequest(ring, res);
+                        break;
+                case ANSWERING:
+                        writedone(ring, res);
+                        break;
+                }
+        }
+};
+                        default:
+                                std::cerr << "request error: (" << err << ") " << strerror(err) << std::endl;
+                                exit(EXIT_FAILURE);
+                }
+        }
+        if(res == 0) {
+                close(in->fd);
+                free(in);
+                return;
+        }
+        const char * it = in->buff;
+        if( !strstr( it, "\r\n\r\n" ) ) {
+                std::cout << "Incomplete request" << std::endl;
+                close(in->fd);
+                free(in);
+                return;
+        }
+        it = in->buff;
+        const std::string reply = "Hello, World!\n";
+        int ret = memcmp(it, "GET ", 4);
+        if( ret != 0 ) {
+                ring_answer(ring, in->fd, E400);
+                goto NEXT;
+        }
+        it += 4;
+        ret = memcmp(it, "/plaintext", 10);
+        if( ret != 0 ) {
+                ring_answer(ring, in->fd, E404);
+                goto NEXT;
+        }
+        ring_answer(ring, in->fd, reply);
+        NEXT:
+                ring_request(ring, in->fd);
+                return;
+}
+static void handle_answer(struct io_uring * ring, struct request_t * in, int res) {
+        if( res < 0 ) {
+                int err = -res;
+                switch(err) {
+                        case EPIPE:
+                        case ECONNRESET:
+                                close(in->fd);
+                                free(in);
+                                return;
+                        default:
+                                std::cerr << "answer error: (" << err << ") " << strerror(err) << std::endl;
+                                exit(EXIT_FAILURE);
+                }
+        }
+        if( res >= in->length ) {
+                free(in);
+                return;
+        }
+        struct io_uring_sqe * sqe = get_sqe(ring);
+        io_uring_prep_write(sqe, in->fd, in->buff + res, in->length - res, 0);
+        io_uring_sqe_set_data(sqe, in);
+        submit(ring);
+        // std::cout << "Re-Submitted request: " << in << " (" << (void*)in->buffer << ")"<<std::endl;
+        ring_request(ring, in->fd);
+}
 //=========================================================
+// Main loop of the WebServer
+// Effectively uses one thread_local copy of everything per kernel thread
+extern "C" {
+extern int __io_uring_flush_sq(struct io_uring *ring);
+}
 void * proc_loop(void * arg) {
         // Get the thread local argument
+        size_t count = 0;
         struct options_t & opt = *(struct options_t *)arg;
         struct io_uring * ring = opt.ring;
-        // Track the shutdown using a event_fd
         char endfd_buf[8];
         ring_end(ring, opt.endfd, endfd_buf, 8);
+        // Accept our first connection
+        // May not take effect until io_uring_submit_and_wait
+        connection::accept(ring, opt);
+        int reset = 1;       // Counter to print stats once in a while
+        bool done = false;   // Are we done
+        size_t sqes = 0;     // Number of sqes we submitted
+        size_t call = 0;     // Number of submits we made
+        ring_accept(ring, opt.acpt.sockfd, opt.acpt.addr, opt.acpt.addrlen, opt.acpt.flags);
+        bool done = false;
         while(!done) {
+                // Submit all the answers we have and wait for responses
+                int ret = io_uring_submit_and_wait(ring, 1);
+                // check errors
+                if (ret < 0) {
+                        fprintf( stderr, "io_uring S&W error: (%d) %s\n", (int)-ret, strerror(-ret) );
+                struct io_uring_cqe *cqe;
+                int ret;
+                while(-EAGAIN == (ret = io_uring_wait_cqe_nr(ring, &cqe, 0))) {
+                        ret = io_uring_submit_and_wait(ring, 1);
+                        if (ret < 0) {
+                                fprintf( stderr, "io_uring get error: (%d) %s\n", (int)-ret, strerror(-ret) );
+                                exit(EXIT_FAILURE);
+                        }
+                        opt.result.subs += ret;
+                        opt.result.cnts++;
+                }
+                if (ret < 0 && -EAGAIN != ret) {
+                        fprintf( stderr, "io_uring peek error: (%d) %s\n", (int)-ret, strerror(-ret) );
                         exit(EXIT_FAILURE);
+                }
+                // Check how good we are at batching sqes
+                sqes += ret;
+                call++;
+                struct io_uring_cqe *cqe;
+                unsigned head;
+                unsigned count = 0;
+                // go through all cqes
+                io_uring_for_each_cqe(ring, head, cqe) {
+                        if (0 == cqe->user_data) {
+                auto req = (struct request_t *)cqe->user_data;
+                // std::cout << req << " completed with " << cqe->res << std::endl;
+                switch(req->type) {
+                        case EVENT_END:
                                 done = true;
                                 break;
+                        }
+                        auto req = (class connection *)cqe->user_data;
+                        req->handle( ring, cqe->res, opt );
+                        // Every now and then, print some stats
+                        reset--;
+                        if(reset == 0) {
+                                std::cout << "Submit average: " << sqes << "/" << call << "(" << (((double)sqes) / call) << ")" << std::endl;
+                                // Reset to some random number of completions
+                                // use the ring_fd in the number of threads don't all print at once
+                                reset = 100000 + (100000 * (ring->ring_fd % 5));
+                        }
+                        // Keep track of how many cqes we have seen
+                        count++;
+                }
+                // Mark the cqes as seen
+                io_uring_cq_advance(ring, count);
+        }
+        // Tally all the thread local statistics
+        __atomic_fetch_add( &global_stats.completions.conns, ::stats.completions.conns, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.completions.reads, ::stats.completions.reads, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.completions.writes, ::stats.completions.writes, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.completions.full_writes, ::stats.completions.full_writes, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.conns, ::stats.errors.conns, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.requests.pipes, ::stats.errors.requests.pipes, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.requests.reset, ::stats.errors.requests.reset, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.requests.other, ::stats.errors.requests.other, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.answers.pipes, ::stats.errors.answers.pipes, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.answers.reset, ::stats.errors.answers.reset, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.errors.answers.other, ::stats.errors.answers.other, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.conns.current, ::stats.conns.current, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.conns.max, ::stats.conns.max, __ATOMIC_SEQ_CST );
+        __atomic_fetch_add( &global_stats.conns.used, ::stats.conns.used, __ATOMIC_SEQ_CST );
+        return nullptr;
+                        case EVENT_ACCEPT:
+                                handle_new_conn(ring, cqe->res);
+                                free(req);
+                                ring_accept(ring, opt.acpt.sockfd, opt.acpt.addr, opt.acpt.addrlen, opt.acpt.flags);
+                                break;
+                        case EVENT_REQUEST:
+                                handle_request(ring, req, cqe->res);
+                                break;
+                        case EVENT_ANSWER:
+                                handle_answer(ring, req, cqe->res);
+                                break;
+                }
+                io_uring_cqe_seen(ring, cqe);
+        }
+        return (void*)count;
+}
 //=========================================================
+#include <bit> // for ispow2
+struct __attribute__((aligned(128))) aligned_ring {
+        struct io_uring storage;
+};
+#include <bit>
+#include <pthread.h>
 extern "C" {
+        #include <pthread.h>      // for pthreads
+        #include <signal.h>       // for signal(SIGPIPE, SIG_IGN);
+        #include <sys/eventfd.h>  // use for termination
+        #include <sys/socket.h>   // for sockets in general
+        #include <netinet/in.h>   // for sockaddr_in, AF_INET
+        #include <signal.h>
+        #include <sys/eventfd.h>
+        #include <sys/socket.h>
+        #include <netinet/in.h>
+}
 int main(int argc, char * argv[]) {
-        // Initialize the array of connection-fd associations
-        for(int i = 0; i < array_max; i++) {
-                conns[i] = nullptr;
+        }
-        // Make sure we ignore all sigpipes
         signal(SIGPIPE, SIG_IGN);
+        // Default command line arguments
+        unsigned nthreads = 1;      // number of kernel threads
+        unsigned port = 8800;       // which port to listen on
+        unsigned entries = 256;     // number of entries per ring/kernel thread
+        unsigned backlog = 262144;  // backlog argument to listen
+        bool attach = false;        // Whether or not to attach all the rings
+        bool sqpoll = false;        // Whether or not to use SQ Polling
+        //===================
+        // Arguments Parsing
+        unsigned nthreads = 1;
+        unsigned port = 8800;
+        unsigned entries = 256;
+        unsigned backlog = 10;
+        bool attach = false;
+        //===================
+        // Arguments
         int c;
         while ((c = getopt (argc, argv, "t:p:e:b:aS")) != -1) {
+        while ((c = getopt (argc, argv, "t:p:e:b:a")) != -1) {
                 switch (c)
+                {
 …
                         attach = true;
                         break;
-                case 'S':
-                        sqpoll = true;
-                        break;
                 case '?':
                 default:
                         std::cerr << "Usage: -t <threads> -p <port> -e <entries> -b <backlog> -aS" << std::endl;
+                        std::cerr << "Usage: -t <threads> -p <port> -e <entries> -b <backlog> -a" << std::endl;
                         return EXIT_FAILURE;
+                }
 …
         //===================
         // End FD
-        // Create a single event fd to notify the kernel threads when the server shutsdown
         int efd = eventfd(0, EFD_SEMAPHORE);
         if (efd < 0) {
 …
         //===================
         // Open Socket
-        // Listen on specified port
         std::cout << getpid() << " : Listening on port " << port << std::endl;
         int server_fd = socket(AF_INET, SOCK_STREAM, 0);
 …
         address.sin_port = htons( port );
-        // In case the port is already in use, don't just return an error
-        // Linux is very slow at reclaiming port so just retry regularly
         int waited = 0;
         while(true) {
 …
                 if(ret < 0) {
                         if(errno == EADDRINUSE) {
-                                // Port is in used let's retry later
                                 if(waited == 0) {
                                         std::cerr << "Waiting for port" << std::endl;
                                 } else {
-                                        // To be cure, print how long we have been waiting
                                         std::cerr << "\r" << waited;
                                         std::cerr.flush();
+                                }
                                 waited ++;
                                 usleep( 1000000 ); // Wait and retry
+                                usleep( 1000000 );
                                 continue;
+                        }
-                        // Some other error occured, this is a real error
                         std::cerr << "bind error: (" << errno << ") " << strerror(errno) << std::endl;
                         exit(EXIT_FAILURE);
 …
         std::cout << std::endl;
-        // Create the desired number of kernel-threads and for each
-        // create a ring. Create the rings in the main so we can attach them
-        // Since the rings are all in a dense VLA, aligned them so we don't get false sharing
-        // it's unlikely but better safe than sorry
-        struct __attribute__((aligned(128))) aligned_ring {
-                struct io_uring storage;
-        };
         aligned_ring thrd_rings[nthreads];
         pthread_t    thrd_hdls[nthreads];
         options_t    thrd_opts[nthreads];
-        bool no_drops  = true;
-        bool fast_poll = true;
-        bool nfix_sqpl = true;
         for(unsigned i = 0; i < nthreads; i++) {
+                struct io_uring_params p = { };
+                if(sqpoll) { // If sqpoll is on, add the flag
+                        p.flags |= IORING_SETUP_SQPOLL;
+                        p.sq_thread_idle = 100;
+                }
+                if (attach && i != 0) { // If attach is on, add the flag, except for the first ring
+                        p.flags |= IORING_SETUP_ATTACH_WQ;
+                if(!attach || i == 0) {
+                        io_uring_queue_init(entries, &thrd_rings[i].storage, 0);
+                }
+                else {
+                        struct io_uring_params p;
+                        memset(&p, 0, sizeof(p));
+                        p.flags = IORING_SETUP_ATTACH_WQ;
                         p.wq_fd = thrd_rings[0].storage.ring_fd;
+                }
+                // Create the ring
+                io_uring_queue_init_params(entries, &thrd_rings[i].storage, &p);
+                // Check if some of the note-worthy features are there
+                if(0 == (p.features & IORING_FEAT_NODROP         )) { no_drops  = false; }
+                if(0 == (p.features & IORING_FEAT_FAST_POLL      )) { fast_poll = false; }
+                if(0 == (p.features & IORING_FEAT_SQPOLL_NONFIXED)) { nfix_sqpl = false; }
+                // Write the socket options we want to the options we pass to the threads
+                        io_uring_queue_init_params(entries, &thrd_rings[i].storage, &p);
+                }
                 thrd_opts[i].acpt.sockfd  = server_fd;
                 thrd_opts[i].acpt.addr    = (struct sockaddr *)&address;
 …
+        }
-        // Tell the user if the features are present
-        if( no_drops ) std::cout << "No Drop Present" << std::endl;
-        if( fast_poll) std::cout << "Fast Poll Present" << std::endl;
-        if(!nfix_sqpl) std::cout << "Non-Fixed SQ Poll not Present" << std::endl;
         //===================
         // Server Started
 …
                 int ret;
                 do {
-                        // Wait for a Ctrl-D to close the server
                         ret = read(STDIN_FILENO, buffer, 128);
                         if(ret < 0) {
 …
         //===================
-        // Use eventfd_write to tell the threads we are closing
         (std::cout << "Sending Shutdown to Threads... ").flush();
         ret = eventfd_write(efd, nthreads);
 …
         //===================
-        // Join all the threads and close the rings
         (std::cout << "Stopping Threads Done... ").flush();
+        size_t total = 0;
+        size_t count = 0;
         for(unsigned i = 0; i < nthreads; i++) {
                 void * retval;
 …
                         exit(EXIT_FAILURE);
+                }
+                // total += (size_t)retval;
+                total += thrd_opts[i].result.subs;
+                count += thrd_opts[i].result.cnts;
                 io_uring_queue_exit(thrd_opts[i].ring);
+        }
         std::cout << "done" << std::endl;
+        //===================
         // Close the sockets
+        std::cout << "Submit average: " << total << "/" << count << "(" << (((double)total) / count) << ")" << std::endl;
+        //===================
         (std::cout << "Closing Socket... ").flush();
         ret = shutdown( server_fd, SHUT_RD );
 …
                 exit(EXIT_FAILURE);
+        }
+        std::cout << "done" << std::endl << std::endl;
+        // Print stats and exit
+        std::cout << "Errors: " << global_stats.errors.conns << "c, (" << global_stats.errors.requests.pipes << "p, " << global_stats.errors.requests.reset << "r, " << global_stats.errors.requests.other << "o" << ")r, (" << global_stats.errors.answers.pipes << "p, " << global_stats.errors.answers.reset << "r, " << global_stats.errors.answers.other << "o" << ")a" << std::endl;
+        std::cout << "Completions: " << global_stats.completions.conns << "c, " << global_stats.completions.reads << "r, " << global_stats.completions.writes << "w" << std::endl;
+        std::cout << "Full Writes: " << global_stats.completions.full_writes << std::endl;
+        std::cout << "Max FD: " << max_fd << std::endl;
+        std::cout << "Successful connections: " << global_stats.conns.used << std::endl;
+        std::cout << "Max concurrent connections: " << global_stats.conns.max << std::endl;
+        std::cout << "Accepts on non-zeros: " << global_stats.recycle_errors << std::endl;
+        std::cout << "Leaked conn objects: " << global_stats.conns.current << std::endl;
+}
+// compile-command: "g++ http_ring.cpp -std=c++2a -pthread -luring -O3" //
+        std::cout << "done" << std::endl;
+}

doc/theses/andrew_beach_MMath/existing.tex

-              r3b402339
+              r144fa5c
 obvious to the reader.
+\section{\texorpdfstring{Overloading and \lstinline|extern|}
+         {Overloading and extern}}
+\section{\texorpdfstring{Overloading and \lstinline|extern|}{Overloading and extern}}
 \CFA has extensive overloading, allowing multiple definitions of the same name
 to be defined.~\cite{Moss18}

doc/theses/andrew_beach_MMath/features.tex

-              r3b402339
+              r144fa5c
 Virtual types and casts are not required for a basic exception-system but are
 useful for advanced exception features. However, \CFA is not object-oriented so
 there is no obvious concept of virtuals. Hence, to create advanced exception
+there is no obvious concept of virtuals.  Hence, to create advanced exception
 features for this work, I needed to designed and implemented a virtual-like
 system for \CFA.
 …
 \end{center}
 The hierarchy provides the ability to handle an exception at different degrees
 of specificity (left to right). Hence, it is possible to catch a more general
+of specificity (left to right).  Hence, it is possible to catch a more general
 exception-type in higher-level code where the implementation details are
 unknown, which reduces tight coupling to the lower-level implementation.
 …
 Exceptions are defined by the trait system; there are a series of traits, and
 if a type satisfies them, then it can be used as an exception. The following
+if a type satisfies them, then it can be used as an exception.  The following
 is the base trait all exceptions need to match.
 \begin{cfa}
 …
 \PAB{I do not understand this paragraph.}
 One odd thing about @get_exception_vtable@ is that it should always be a
 constant function, returning the same value regardless of its argument. A
+constant function, returning the same value regardless of its argument.  A
 pointer or reference to the virtual table instance could be used instead,
 however using a function has some ease of implementation advantages and allows
 for easier disambiguation because the virtual type name (or the address of an
 instance that is in scope) can be used instead of the mangled virtual table
 name. Also note the use of the word ``promise'' in the trait
+name.  Also note the use of the word ``promise'' in the trait
 description. Currently, \CFA cannot check to see if either @exceptT@ or
 @virtualT@ match the layout requirements. This is considered part of
 …
 Finally there are three convenience macros for referring to the these traits:
 @IS_EXCEPTION@, @IS_TERMINATION_EXCEPTION@ and @IS_RESUMPTION_EXCEPTION@. Each
+@IS_EXCEPTION@, @IS_TERMINATION_EXCEPTION@ and @IS_RESUMPTION_EXCEPTION@.  Each
 takes the virtual type's name, and for polymorphic types only, the
 parenthesized list of polymorphic arguments. These macros do the name mangling
 …
 expression has a type with a @void defaultResumptionHandler(T &)@ (default
 handler) defined, where the handler is found at the call site by the type
 system. At runtime, a representation of the exception type and an instance of
+system.  At runtime, a representation of the exception type and an instance of
 the exception type is \emph{not} copied because the stack is maintained during
 the handler search.
 …
 exception matches, @CONDITION@ is executed. The condition expression may
 reference all names in scope at the beginning of the try block and @NAME@
 introduced in the handler clause. If the condition is true, then the handler
+introduced in the handler clause.  If the condition is true, then the handler
 matches. Otherwise, the exception search continues at the next appropriate kind
 of handler clause in the try block.
 …
 the end of the block. This requirement ensures always continues as if the
 finally clause is not present, \ie finally is for cleanup not changing control
 flow. Because of this requirement, local control flow out of the finally block
 is forbidden. The compiler precludes any @break@, @continue@, @fallthru@ or
+flow.  Because of this requirement, local control flow out of the finally block
+is forbidden.  The compiler precludes any @break@, @continue@, @fallthru@ or
 @return@ that causes control to leave the finally block. Other ways to leave
 the finally block, such as a long jump or termination are much harder to check,
 …
 There is no special statement for starting a cancellation; instead the standard
 library function @cancel_stack@ is called passing an exception. Unlike a
+library function @cancel_stack@ is called passing an exception.  Unlike a
 raise, this exception is not used in matching only to pass information about
 the cause of the cancellation.
 …
 \item[Main Stack:]
 The main stack is the one used by the program main at the start of execution,
 and is the only stack in a sequential program. Hence, when cancellation is
+and is the only stack in a sequential program.  Hence, when cancellation is
 forwarded to the main stack, there is no other forwarding stack, so after the
 stack is unwound, there is a program-level abort.
 …
 \item[Thread Stack:]
 A thread stack is created for a @thread@ object or object that satisfies the
 @is_thread@ trait. A thread only has two points of communication that must
+@is_thread@ trait.  A thread only has two points of communication that must
 happen: start and join. As the thread must be running to perform a
 cancellation, it must occur after start and before join, so join is a
 cancellation point. After the stack is unwound, the thread halts and waits for
+cancellation point.  After the stack is unwound, the thread halts and waits for
 another thread to join with it. The joining thread, checks for a cancellation,
 and if present, resumes exception @ThreadCancelled@.
 …
 \item[Coroutine Stack:] A coroutine stack is created for a @coroutine@ object
 or object that satisfies the @is_coroutine@ trait. A coroutine only knows of
 two other coroutines, its starter and its last resumer. The last resumer has
 the tightest coupling to the coroutine it activated. Hence, cancellation of
+or object that satisfies the @is_coroutine@ trait.  A coroutine only knows of
+two other coroutines, its starter and its last resumer.  The last resumer has
+the tightest coupling to the coroutine it activated.  Hence, cancellation of
 the active coroutine is forwarded to the last resumer after the stack is
 unwound, as the last resumer has the most precise knowledge about the current

doc/theses/andrew_beach_MMath/implement.tex

-              r3b402339
+              r144fa5c
 @_URC_END_OF_STACK@.
+Second, when a handler is matched, raise exception continues onto the cleanup
+phase.
+Second, when a handler is matched, raise exception continues onto the cleanup phase.
 Once again, it calls the personality functions of each stack frame from newest
 to oldest. This pass stops at the stack frame containing the matching handler.

doc/theses/andrew_beach_MMath/thesis-frontpgs.tex

-              r3b402339
+              r144fa5c
         A thesis \\
         presented to the University of Waterloo \\
+        presented to the University of Waterloo \\
         in fulfillment of the \\
         thesis requirement for the degree of \\
 …
 \cleardoublepage
 %----------------------------------------------------------------------
 % EXAMINING COMMITTEE (Required for Ph.D. theses only)
 …
 \begin{center}\textbf{Examining Committee Membership}\end{center}
   \noindent
+The following served on the Examining Committee for this thesis. The decision
+of the Examining Committee is by majority vote.
+  \bigskip
+  \noindent
+\begin{tabbing}
+Internal-External Member: \=  \kill % using longest text to define tab length
+External Examiner: \>  Bruce Bruce \\
+The following served on the Examining Committee for this thesis. The decision of the Examining Committee is by majority vote.
+  \bigskip
+  \noindent
+\begin{tabbing}
+Internal-External Member: \=  \kill % using longest text to define tab length
+External Examiner: \>  Bruce Bruce \\
 \> Professor, Dept. of Philosophy of Zoology, University of Wallamaloo \\
 \end{tabbing}
   \bigskip
+\end{tabbing}
+  \bigskip
   \noindent
 \begin{tabbing}
 …
 \end{tabbing}
   \bigskip
   \noindent
   \begin{tabbing}
 …
 \end{tabbing}
   \bigskip
   \noindent
 \begin{tabbing}
 …
 \end{tabbing}
   \bigskip
   \noindent
 \begin{tabbing}
 …
   % December 13th, 2006.  It is designed for an electronic thesis.
   \noindent
+I hereby declare that I am the sole author of this thesis. This is a true copy
+of the thesis, including any required final revisions, as accepted by my
+examiners.
+  \bigskip
+I hereby declare that I am the sole author of this thesis. This is a true copy of the thesis, including any required final revisions, as accepted by my examiners.
+  \bigskip
   \noindent
 I understand that my thesis may be made electronically available to the public.

doc/theses/andrew_beach_MMath/thesis.tex

-              r3b402339
+              r144fa5c
 % FRONT MATERIAL
 %----------------------------------------------------------------------
 \input{thesis-frontpgs}
+\input{thesis-frontpgs}
 %----------------------------------------------------------------------
 …
 A \gls{computer} could compute $\pi$ all day long. In fact, subsets of digits
 of $\pi$'s decimal approximation would make a good source for psuedo-random
 vectors, \gls{rvec} .
+vectors, \gls{rvec} .
 %----------------------------------------------------------------------
 …
 \begin{itemize}
 \item A well-prepared PDF should be
+\item A well-prepared PDF should be
   \begin{enumerate}
     \item Of reasonable size, {\it i.e.} photos cropped and compressed.
     \item Scalable, to allow enlargment of text and drawings.
   \end{enumerate}
+    \item Scalable, to allow enlargment of text and drawings.
+  \end{enumerate}
 \item Photos must be bit maps, and so are not scaleable by definition. TIFF and
 BMP are uncompressed formats, while JPEG is compressed. Most photos can be
 compressed without losing their illustrative value.
 \item Drawings that you make should be scalable vector graphics, \emph{not}
+\item Drawings that you make should be scalable vector graphics, \emph{not}
 bit maps. Some scalable vector file formats are: EPS, SVG, PNG, WMF. These can
 all be converted into PNG or PDF, that pdflatex recognizes. Your drawing
 package probably can export to one of these formats directly. Otherwise, a
 common procedure is to print-to-file through a Postscript printer driver to
 create a PS file, then convert that to EPS (encapsulated PS, which has a
 bounding box to describe its exact size rather than a whole page).
+all be converted into PNG or PDF, that pdflatex recognizes. Your drawing
+package probably can export to one of these formats directly. Otherwise, a
+common procedure is to print-to-file through a Postscript printer driver to
+create a PS file, then convert that to EPS (encapsulated PS, which has a
+bounding box to describe its exact size rather than a whole page).
 Programs such as GSView (a Ghostscript GUI) can create both EPS and PDF from
 PS files. Appendix~\ref{AppendixA} shows how to generate properly sized Matlab
 plots and save them as PDF.
 \item It's important to crop your photos and draw your figures to the size that
 you want to appear in your thesis. Scaling photos with the
 includegraphics command will cause loss of resolution. And scaling down
+you want to appear in your thesis. Scaling photos with the
+includegraphics command will cause loss of resolution. And scaling down
 drawings may cause any text annotations to become too small.
 \end{itemize}
 For more information on \LaTeX\, see the uWaterloo Skills for the
 Academic Workplace \href{https://uwaterloo.ca/information-systems-technology/services/electronic-thesis-preparation-and-submission-support/ethesis-guide/creating-pdf-version-your-thesis/creating-pdf-files-using-latex/latex-ethesis-and-large-documents}{course notes}.
+Academic Workplace \href{https://uwaterloo.ca/information-systems-technology/services/electronic-thesis-preparation-and-submission-support/ethesis-guide/creating-pdf-version-your-thesis/creating-pdf-files-using-latex/latex-ethesis-and-large-documents}{course notes}.
 \footnote{
 Note that while it is possible to include hyperlinks to external documents,
 it is not wise to do so, since anything you can't control may change over time.
 It \emph{would} be appropriate and necessary to provide external links to
 additional resources for a multimedia ``enhanced'' thesis.
 But also note that if the \package{hyperref} package is not included,
 as for the print-optimized option in this thesis template, any \cmmd{href}
+it is not wise to do so, since anything you can't control may change over time.
+It \emph{would} be appropriate and necessary to provide external links to
+additional resources for a multimedia ``enhanced'' thesis.
+But also note that if the \package{hyperref} package is not included,
+as for the print-optimized option in this thesis template, any \cmmd{href}
 commands in your logical document are no longer defined.
 A work-around employed by this thesis template is to define a dummy
 \cmmd{href} command (which does nothing) in the preamble of the document,
 before the \package{hyperref} package is included.
+\cmmd{href} command (which does nothing) in the preamble of the document,
+before the \package{hyperref} package is included.
 The dummy definition is then redifined by the
 \package{hyperref} package when it is included.
 …
 The classic book by Leslie Lamport \cite{lamport.book}, author of \LaTeX , is
 worth a look too, and the many available add-on packages are described by
+worth a look too, and the many available add-on packages are described by
 Goossens \textit{et al} \cite{goossens.book}.
 …
 Export Setup button in the figure Property Editor.
 \section{From the Command Line}
+\section{From the Command Line}
 All figure properties can also be manipulated from the command line. Here's an
 example:
+example:
 \begin{verbatim}
 x=[0:0.1:pi];

doc/theses/andrew_beach_MMath/uw-ethesis-frontpgs.tex

-              r3b402339
+              r144fa5c
         \normalsize
         A thesis \\
         presented to the University of Waterloo \\
+        presented to the University of Waterloo \\
         in fulfillment of the \\
         thesis requirement for the degree of \\
 …
 \end{titlepage}
+% The rest of the front pages should contain no headers and be numbered using
+% Roman numerals starting with `ii'.
+% The rest of the front pages should contain no headers and be numbered using Roman numerals starting with `ii'
 \pagestyle{plain}
 \setcounter{page}{2}
+\cleardoublepage % Ends the current page and causes all figures and tables
+% that have so far appeared in the input to be printed. In a two-sided
+% printing style, it also makes the next page a right-hand (odd-numbered)
+% page, producing a blank page if necessary.
+\cleardoublepage % Ends the current page and causes all figures and tables that have so far appeared in the input to be printed.
+% In a two-sided printing style, it also makes the next page a right-hand (odd-numbered) page, producing a blank page if necessary.
 \begin{comment}
+\begin{comment}
 % E X A M I N I N G   C O M M I T T E E (Required for Ph.D. theses only)
 % Remove or comment out the lines below to remove this page
 \begin{center}\textbf{Examining Committee Membership}\end{center}
   \noindent
+The following served on the Examining Committee for this thesis.
+The decision of the Examining Committee is by majority vote.
+The following served on the Examining Committee for this thesis. The decision of the Examining Committee is by majority vote.
   \bigskip
   \noindent
 \begin{tabbing}
 Internal-External Member: \=  \kill % using longest text to define tab length
 External Examiner: \>  Bruce Bruce \\
+External Examiner: \>  Bruce Bruce \\
 \> Professor, Dept. of Philosophy of Zoology, University of Wallamaloo \\
 \end{tabbing}
+\end{tabbing}
   \bigskip
   \noindent
 \begin{tabbing}
 …
 \end{tabbing}
   \bigskip
   \noindent
   \begin{tabbing}
 …
 \end{tabbing}
   \bigskip
   \noindent
 \begin{tabbing}
 …
 \end{tabbing}
   \bigskip
   \noindent
 \begin{tabbing}
 …
   % December 13th, 2006.  It is designed for an electronic thesis.
  \begin{center}\textbf{Author's Declaration}\end{center}
  \noindent
+I hereby declare that I am the sole author of this thesis. This is a true copy
+of the thesis, including any required final revisions, as accepted by my
+examiners.
+I hereby declare that I am the sole author of this thesis. This is a true copy of the thesis, including any required final revisions, as accepted by my examiners.
   \bigskip
   \noindent
 I understand that my thesis may be made electronically available to the public.

doc/theses/andrew_beach_MMath/uw-ethesis.tex

-              r3b402339
+              r144fa5c
 %======================================================================
 % University of Waterloo Thesis Template for LaTeX
 % Last Updated November, 2020
 % by Stephen Carr, IST Client Services,
+% University of Waterloo Thesis Template for LaTeX
+% Last Updated November, 2020
+% by Stephen Carr, IST Client Services,
 % University of Waterloo, 200 University Ave. W., Waterloo, Ontario, Canada
 % FOR ASSISTANCE, please send mail to request@uwaterloo.ca
 % DISCLAIMER
+% To the best of our knowledge, this template satisfies the current uWaterloo
+% thesis requirements. However, it is your responsibility to assure that you
+% have met all requirements of the University and your particular department.
+% Many thanks for the feedback from many graduates who assisted the
+% development of this template. Also note that there are explanatory comments
+% and tips throughout this template.
+% To the best of our knowledge, this template satisfies the current uWaterloo thesis requirements.
+% However, it is your responsibility to assure that you have met all requirements of the University and your particular department.
+% Many thanks for the feedback from many graduates who assisted the development of this template.
+% Also note that there are explanatory comments and tips throughout this template.
 %======================================================================
 % Some important notes on using this template and making it your own...
+% The University of Waterloo has required electronic thesis submission since
+% October 2006. See the uWaterloo thesis regulations at:
+%   https://uwaterloo.ca/graduate-studies/thesis.
+% This thesis template is geared towards generating a PDF version optimized
+% for viewing on an electronic display, including hyperlinks within the PDF.
+% DON'T FORGET TO ADD YOUR OWN NAME AND TITLE in the "hyperref" package
+% configuration below. THIS INFORMATION GETS EMBEDDED IN THE FINAL PDF
+% DOCUMENT. You can view the information if you view properties of the PDF.
+% Many faculties/departments also require one or more printed copies.
+% This template attempts to satisfy both types of output.
+% The University of Waterloo has required electronic thesis submission since October 2006.
+% See the uWaterloo thesis regulations at
+% https://uwaterloo.ca/graduate-studies/thesis.
+% This thesis template is geared towards generating a PDF version optimized for viewing on an electronic display, including hyperlinks within the PDF.
+% DON'T FORGET TO ADD YOUR OWN NAME AND TITLE in the "hyperref" package configuration below.
+% THIS INFORMATION GETS EMBEDDED IN THE PDF FINAL PDF DOCUMENT.
+% You can view the information if you view properties of the PDF document.
+% Many faculties/departments also require one or more printed copies.
+% This template attempts to satisfy both types of output.
 % See additional notes below.
+% It is based on the standard "book" document class which provides all
+% necessary sectioning structures and allows multi-part theses.
+% If you are using this template in Overleaf (cloud-based collaboration
+% service), then it is automatically processed and previewed for you as you
+% edit.
+% For people who prefer to install their own LaTeX distributions on their own
+% computers, and process the source files manually, the following notes
+% provide the sequence of tasks:
+% It is based on the standard "book" document class which provides all necessary sectioning structures and allows multi-part theses.
+% If you are using this template in Overleaf (cloud-based collaboration service), then it is automatically processed and previewed for you as you edit.
+% For people who prefer to install their own LaTeX distributions on their own computers, and process the source files manually, the following notes provide the sequence of tasks:
 % E.g. to process a thesis called "mythesis.tex" based on this template, run:
 % pdflatex mythesis     -- first pass of the pdflatex processor
 % bibtex mythesis       -- generates bibliography from .bib data file(s)
+% makeindex         -- should be run only if an index is used
+% pdflatex mythesis     -- fixes numbering in cross-references, bibliographic
+%                      references, glossaries, index, etc.
+% pdflatex mythesis     -- it takes a couple of passes to completely process all
+%                      cross-references
+% If you use the recommended LaTeX editor, Texmaker, you would open the
+% mythesis.tex file, then click the PDFLaTeX button. Then run BibTeX (under
+% the Tools menu). Then click the PDFLaTeX button two more times.
+% If you have an index as well, you'll need to run MakeIndex from the Tools
+% menu as well, before running pdflatex the last two times.
+% N.B. The "pdftex" program allows graphics in the following formats to be
+% included with the "\includegraphics" command: PNG, PDF, JPEG, TIFF
+% Tip: Generate your figures and photos in the size you want them to appear
+% in your thesis, rather than scaling them with \includegraphics options.
+% Tip: Any drawings you do should be in scalable vector graphic formats: SVG,
+% PNG, WMF, EPS and then converted to PNG or PDF, so they are scalable in the
+% final PDF as well.
+% makeindex         -- should be run only if an index is used
+% pdflatex mythesis     -- fixes numbering in cross-references, bibliographic references, glossaries, index, etc.
+% pdflatex mythesis     -- it takes a couple of passes to completely process all cross-references
+% If you use the recommended LaTeX editor, Texmaker, you would open the mythesis.tex file, then click the PDFLaTeX button. Then run BibTeX (under the Tools menu).
+% Then click the PDFLaTeX button two more times.
+% If you have an index as well,you'll need to run MakeIndex from the Tools menu as well, before running pdflatex
+% the last two times.
+% N.B. The "pdftex" program allows graphics in the following formats to be included with the "\includegraphics" command: PNG, PDF, JPEG, TIFF
+% Tip: Generate your figures and photos in the size you want them to appear in your thesis, rather than scaling them with \includegraphics options.
+% Tip: Any drawings you do should be in scalable vector graphic formats: SVG, PNG, WMF, EPS and then converted to PNG or PDF, so they are scalable in the final PDF as well.
 % Tip: Photographs should be cropped and compressed so as not to be too large.
+% To create a PDF output that is optimized for double-sided printing:
+% 1) comment-out the \documentclass statement in the preamble below, and
+%    un-comment the second \documentclass line.
+% 2) change the value assigned below to the boolean variable "PrintVersion"
+%    from " false" to "true".
+% ======================================================================
+% To create a PDF output that is optimized for double-sided printing:
+% 1) comment-out the \documentclass statement in the preamble below, and un-comment the second \documentclass line.
+% 2) change the value assigned below to the boolean variable "PrintVersion" from " false" to "true".
+%======================================================================
 %   D O C U M E N T   P R E A M B L E
 % Specify the document class, default style attributes, page dimensions, etc.
+% Specify the document class, default style attributes, and page dimensions, etc.
 % For hyperlinked PDF, suitable for viewing on a computer, use this:
 \documentclass[letterpaper,12pt,titlepage,oneside,final]{book}
+% For PDF, suitable for double-sided printing, change the PrintVersion
+% variable below to "true" and use this \documentclass line instead of the
+% one above:
+% For PDF, suitable for double-sided printing, change the PrintVersion variable below to "true" and use this \documentclass line instead of the one above:
 %\documentclass[letterpaper,12pt,titlepage,openright,twoside,final]{book}
 % Some LaTeX commands I define for my own nomenclature.
+% If you have to, it's easier to make changes to nomenclature once here than
+% in a million places throughout your thesis!
+% If you have to, it's easier to make changes to nomenclature once here than in a million places throughout your thesis!
 \newcommand{\package}[1]{\textbf{#1}} % package names in bold text
+\newcommand{\cmmd}[1]{\textbackslash\texttt{#1}} % command name in tt font
+\newcommand{\href}[1]{#1} % does nothing, but defines the command so the
+% print-optimized version will ignore \href tags (redefined by hyperref pkg).
+\newcommand{\cmmd}[1]{\textbackslash\texttt{#1}} % command name in tt font
+\newcommand{\href}[1]{#1} % does nothing, but defines the command so the print-optimized version will ignore \href tags (redefined by hyperref pkg).
 %\newcommand{\texorpdfstring}[2]{#1} % does nothing, but defines the command
 % Anything defined here may be redefined by packages added below...
 …
 \newboolean{PrintVersion}
 \setboolean{PrintVersion}{false}
+% CHANGE THIS VALUE TO "true" as necessary, to improve printed results for
+% hard copies by overriding some options of the hyperref package, called below.
+% CHANGE THIS VALUE TO "true" as necessary, to improve printed results for hard copies by overriding some options of the hyperref package, called below.
 %\usepackage{nomencl} % For a nomenclature (optional; available from ctan.org)
+% Lots of math symbols and environments
+\usepackage{amsmath,amssymb,amstext}
+% For including graphics N.B. pdftex graphics driver
+\usepackage[pdftex]{graphicx}
+\usepackage{amsmath,amssymb,amstext} % Lots of math symbols and environments
+\usepackage[pdftex]{graphicx} % For including graphics N.B. pdftex graphics driver
 % Hyperlinks make it very easy to navigate an electronic document.
+% In addition, this is where you should specify the thesis title and author as
+% they appear in the properties of the PDF document.
+% In addition, this is where you should specify the thesis title and author as they appear in the properties of the PDF document.
 % Use the "hyperref" package
 % N.B. HYPERREF MUST BE THE LAST PACKAGE LOADED; ADD ADDITIONAL PKGS ABOVE
 \usepackage[pdftex,pagebackref=true]{hyperref} % with basic options
 %\usepackage[pdftex,pagebackref=true]{hyperref}
+% N.B. pagebackref=true provides links back from the References to the body
+% text. This can cause trouble for printing.
+                % N.B. pagebackref=true provides links back from the References to the body text. This can cause trouble for printing.
 \hypersetup{
     plainpages=false,       % needed if Roman numbers in frontpages
 …
     pdffitwindow=false,     % window fit to page when opened
     pdfstartview={FitH},    % fits the width of the page to the window
 %    pdftitle={uWaterloo\ LaTeX\ Thesis\ Template}, % title: CHANGE THIS TEXT!
+%    pdftitle={uWaterloo\ LaTeX\ Thesis\ Template},    % title: CHANGE THIS TEXT!
 %    pdfauthor={Author},    % author: CHANGE THIS TEXT! and uncomment this line
 %    pdfsubject={Subject},  % subject: CHANGE THIS TEXT! and uncomment this line
 %    pdfkeywords={keyword1} {key2} {key3}, % optional list of keywords
+%    pdfkeywords={keyword1} {key2} {key3}, % list of keywords, and uncomment this line if desired
     pdfnewwindow=true,      % links in new window
     colorlinks=true,        % false: boxed links; true: colored links
 …
     urlcolor=cyan           % color of external links
+}
+% for improved print quality, change some hyperref options
+\ifthenelse{\boolean{PrintVersion}}{
+\ifthenelse{\boolean{PrintVersion}}{   % for improved print quality, change some hyperref options
 \hypersetup{    % override some previously defined hyperref options
 %    colorlinks,%
 …
 }{} % end of ifthenelse (no else)
+% Exception to the rule of hyperref being the last add-on package
+\usepackage[automake,toc,abbreviations]{glossaries-extra}
+% If glossaries-extra is not in your LaTeX distribution, get it from CTAN
+% (http://ctan.org/pkg/glossaries-extra), although it's supposed to be in
+% both the TeX Live and MikTeX distributions. There are also documentation
+% and installation instructions there.
+\usepackage[automake,toc,abbreviations]{glossaries-extra} % Exception to the rule of hyperref being the last add-on package
+% If glossaries-extra is not in your LaTeX distribution, get it from CTAN (http://ctan.org/pkg/glossaries-extra),
+% although it's supposed to be in both the TeX Live and MikTeX distributions. There are also documentation and
+% installation instructions there.
 % Setting up the page margins...
+\setlength{\textheight}{9in}
+\setlength{\topmargin}{-0.45in}
+\setlength{\headsep}{0.25in}
+% uWaterloo thesis requirements specify a minimum of 1 inch (72pt) margin at
+% the top, bottom, and outside page edges and a 1.125 in. (81pt) gutter margin
+% (on binding side). While this is not an issue for electronic viewing, a PDF
+% may be printed, and so we have the same page layout for both printed and
+% electronic versions, we leave the gutter margin in. Set margins to minimum
+% permitted by uWaterloo thesis regulations:
+\setlength{\textheight}{9in}\setlength{\topmargin}{-0.45in}\setlength{\headsep}{0.25in}
+% uWaterloo thesis requirements specify a minimum of 1 inch (72pt) margin at the
+% top, bottom, and outside page edges and a 1.125 in. (81pt) gutter margin (on binding side).
+% While this is not an issue for electronic viewing, a PDF may be printed, and so we have the same page layout for both printed and electronic versions, we leave the gutter margin in.
+% Set margins to minimum permitted by uWaterloo thesis regulations:
 \setlength{\marginparwidth}{0pt} % width of margin notes
 % N.B. If margin notes are used, you must adjust \textwidth, \marginparwidth
 % and \marginparsep so that the space left between the margin notes and page
 % edge is less than 15 mm (0.6 in.)
+% width of space between body text and margin notes
+\setlength{\marginparsep}{0pt}
+% Adds 1/8 in. to binding side of all
+\setlength{\marginparsep}{0pt} % width of space between body text and margin notes
+\setlength{\evensidemargin}{0.125in} % Adds 1/8 in. to binding side of all
 % even-numbered pages when the "twoside" printing option is selected
+\setlength{\evensidemargin}{0.125in}
+% Adds 1/8 in. to the left of all pages when "oneside" printing is selected,
+% and to the left of all odd-numbered pages when "twoside" printing is selected
+\setlength{\oddsidemargin}{0.125in}
+% assuming US letter paper (8.5 in. x 11 in.) and side margins as above
+\setlength{\textwidth}{6.375in}
+\setlength{\oddsidemargin}{0.125in} % Adds 1/8 in. to the left of all pages when "oneside" printing is selected, and to the left of all odd-numbered pages when "twoside" printing is selected
+\setlength{\textwidth}{6.375in} % assuming US letter paper (8.5 in. x 11 in.) and side margins as above
 \raggedbottom
+% The following statement specifies the amount of space between paragraphs.
+% Other reasonable specifications are \bigskipamount and \smallskipamount.
+% The following statement specifies the amount of space between paragraphs. Other reasonable specifications are \bigskipamount and \smallskipamount.
 \setlength{\parskip}{\medskipamount}
+% The following statement controls the line spacing.
+% The default spacing corresponds to good typographic conventions and only
+% slight changes (e.g., perhaps "1.2"), if any, should be made.
+% The following statement controls the line spacing.
+% The default spacing corresponds to good typographic conventions and only slight changes (e.g., perhaps "1.2"), if any, should be made.
 \renewcommand{\baselinestretch}{1} % this is the default line space setting
 % By default, each chapter will start on a recto (right-hand side) page.
+% We also force each section of the front pages to start on a recto page by
+% inserting \cleardoublepage commands. In many cases, this will require that
+% the verso (left-hand) page be blank, and while it should be counted, a page
+% number should not be printed. The following statements ensure a page number
+% is not printed on an otherwise blank verso page.
+% We also force each section of the front pages to start on a recto page by inserting \cleardoublepage commands.
+% In many cases, this will require that the verso (left-hand) page be blank, and while it should be counted, a page number should not be printed.
+% The following statements ensure a page number is not printed on an otherwise blank verso page.
 \let\origdoublepage\cleardoublepage
 \newcommand{\clearemptydoublepage}{%
 …
 \let\cleardoublepage\clearemptydoublepage
+% Define Glossary terms (This is properly done here, in the preamble and
+% could also be \input{} from a separate file...)
+% Define Glossary terms (This is properly done here, in the preamble and could also be \input{} from a separate file...)
 \input{glossaries}
 \makeglossaries
 …
 %   L O G I C A L    D O C U M E N T
 % The logical document contains the main content of your thesis.
+% Being a large document, it is a good idea to divide your thesis into several
+% files, each one containing one chapter or other significant chunk of content,
+% so you can easily shuffle things around later if desired.
+% Being a large document, it is a good idea to divide your thesis into several files, each one containing one chapter or other significant chunk of content, so you can easily shuffle things around later if desired.
 %======================================================================
 \begin{document}
 …
 % FRONT MATERIAL
 % title page,declaration, borrowers' page, abstract, acknowledgements,
+% dedication, table of contents, list of tables, list of figures,
+% nomenclature, etc.
+%----------------------------------------------------------------------
+\input{uw-ethesis-frontpgs}
+% dedication, table of contents, list of tables, list of figures, nomenclature, etc.
+%----------------------------------------------------------------------
+\input{uw-ethesis-frontpgs}
 %----------------------------------------------------------------------
 % MAIN BODY
 % We suggest using a separate file for each chapter of your thesis.
 % Start each chapter file with the \chapter command. Only use \documentclass,
 % \begin{document} and \end{document} commands in this master document.
+% Start each chapter file with the \chapter command.
+% Only use \documentclass or \begin{document} and \end{document} commands in this master document.
 % Tip: Putting each sentence on a new line is a way to simplify later editing.
 %----------------------------------------------------------------------
 …
 % Bibliography
+% The following statement selects the style to use for references.
+% It controls the sort order of the entries in the bibliography and also the
+% formatting for the in-text labels.
+% The following statement selects the style to use for references.
+% It controls the sort order of the entries in the bibliography and also the formatting for the in-text labels.
 \bibliographystyle{plain}
+% This specifies the location of the file containing the bibliographic
+% information. It assumes you're using BibTeX to manage your references (if
+% not, why not?).
+\cleardoublepage % This is needed if the "book" document class is used, to
+% place the anchor in the correct page, because the bibliography will start
+% on its own page.
+% Use \clearpage instead if the document class uses the "oneside" argument.
+\phantomsection  % With hyperref package, enables hyperlinking from the table
+% of contents to bibliography.
+% The following statement causes the title "References" to be used for the
+% bibliography section:
+% This specifies the location of the file containing the bibliographic information.
+% It assumes you're using BibTeX to manage your references (if not, why not?).
+\cleardoublepage % This is needed if the "book" document class is used, to place the anchor in the correct page, because the bibliography will start on its own page.
+% Use \clearpage instead if the document class uses the "oneside" argument
+\phantomsection  % With hyperref package, enables hyperlinking from the table of contents to bibliography
+% The following statement causes the title "References" to be used for the bibliography section:
 \renewcommand*{\bibname}{References}
 …
 \bibliography{uw-ethesis,pl}
+% Tip: You can create multiple .bib files to organize your references. Just
+% list them all in the \bibliogaphy command, separated by commas (no spaces).
+% The following statement causes the specified references to be added to the
+% bibliography even if they were not cited in the text. The asterisk is a
+% wildcard that causes all entries in the bibliographic database to be
+% included (optional).
+% Tip: You can create multiple .bib files to organize your references.
+% Just list them all in the \bibliogaphy command, separated by commas (no spaces).
+% The following statement causes the specified references to be added to the bibliography even if they were not cited in the text.
+% The asterisk is a wildcard that causes all entries in the bibliographic database to be included (optional).
 % \nocite{*}
 %----------------------------------------------------------------------
 …
 % The \appendix statement indicates the beginning of the appendices.
 \appendix
+% Add an un-numbered title page before the appendices and a line in the Table
+% of Contents
+% Add an un-numbered title page before the appendices and a line in the Table of Contents
 % \chapter*{APPENDICES}
 % \addcontentsline{toc}{chapter}{APPENDICES}
+% Appendices are just more chapters, with different labeling (letters instead
+% of numbers).
+% Appendices are just more chapters, with different labeling (letters instead of numbers).
 % \input{appendix-matlab_plots.tex}
+% GLOSSARIES (Lists of definitions, abbreviations, symbols, etc.
+% provided by the glossaries-extra package)
+% GLOSSARIES (Lists of definitions, abbreviations, symbols, etc. provided by the glossaries-extra package)
 % -----------------------------
 \printglossaries

libcfa/src/memory.cfa

-              r3b402339
+              r144fa5c
 // Created On       : Tue Jun  2 16:48:00 2020
 // Last Modified By : Andrew Beach
 // Last Modified On : Mon Feb  1 16:10:00 2021
 // Update Count     : 1
+// Last Modified On : Tue Jun  3 12:30:00 2020
+// Update Count     : 0
 //
 …
+}
 forall(T & | sized(T))
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ?{}(counter_ptr(T) & this, counter_ptr(T) that) {
         // `that` is a copy but it should have neither a constructor
         // nor destructor run on it so it shouldn't need adjustment.
+        internal_decrement(this);
         internal_copy(this, that);
+}
 …
 forall(T & | sized(T), Args... | { void ?{}(T&, Args); })
 void ?{}(counter_ptr(T) & this, Args args) {
+        this.data = malloc();
+        this.data->counter = 1;
+        (this.data->object){args};
+        this.data = (counter_data(T)*)new(args);
+}
 …
 forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
 void ?{}(unique_ptr(T) & this, Args args) {
+        this.data = malloc();
+        (*this.data){args};
+        this.data = (T *)new(args);
+}

libcfa/src/memory.hfa

-              r3b402339
+              r144fa5c
 // Created On       : Tue Jun  2 16:48:00 2020
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jan 29 15:52:00 2021
 // Update Count     : 1
+// Last Modified On : Tue Jun  3 12:29:00 2020
+// Update Count     : 0
 //
 …
 // Internal data object.
 forall(T & | sized(T))
 struct counter_data {
         unsigned int counter;
         T object;
 };
+forall(T & | sized(T)) {
+        struct counter_data {
+                unsigned int counter;
+                T object;
+        };
 forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
 void ?{}(counter_data(T) & this, Args args);
+        forall(Args... | { void ?{}(T &, Args); })
+        void ?{}(counter_data(T) & this, Args args);
+forall(T & | sized(T) | { void ^?{}(T &); })
+void ^?{}(counter_data(T) & this);
+        forall( | { void ^?{}(T &); })
+        void ^?{}(counter_data(T) & this);
+}
 // This is one of many pointers keeping this alive.
 forall(T & | sized(T))
 struct counter_ptr {
         counter_data(T) * data;
 };
+forall(T & | sized(T)) {
+        struct counter_ptr {
+                counter_data(T) * data;
+        };
+forall(T & | sized(T))
+void ?{}(counter_ptr(T) & this);
+forall(T & | sized(T))
+void ?{}(counter_ptr(T) & this, zero_t);
+forall(T & | sized(T))
+void ?{}(counter_ptr(T) & this, counter_ptr(T) that);
+forall(T & | sized(T), Args... | { void ?{}(T&, Args); })
+void ?{}(counter_ptr(T) & this, Args args);
+        void ?{}(counter_ptr(T) & this);
+        void ?{}(counter_ptr(T) & this, zero_t);
+        forall( | { void ^?{}(T &); })
+        void ?{}(counter_ptr(T) & this, counter_ptr(T) that);
+        forall(Args... | { void ?{}(T&, Args); })
+        void ?{}(counter_ptr(T) & this, Args args);
 forall(T & | sized(T) | { void ^?{}(T &); })
 void ^?{}(counter_ptr(T) & this);
+        forall( | { void ^?{}(T &); })
+        void ^?{}(counter_ptr(T) & this);
+forall(T & | sized(T))
+T & *?(counter_ptr(T) & this);
+        T & *?(counter_ptr(T) & this);
 forall(T & | sized(T) | { void ^?{}(T &); })
 void ?=?(counter_ptr(T) & this, counter_ptr(T) that);
 forall(T & | sized(T) | { void ^?{}(T &); })
 void ?=?(counter_ptr(T) & this, zero_t);
+        forall( | { void ^?{}(T &); })
+        void ?=?(counter_ptr(T) & this, counter_ptr(T) that);
+        forall( | { void ^?{}(T &); })
+        void ?=?(counter_ptr(T) & this, zero_t);
+forall(T & | sized(T))
+int ?==?(counter_ptr(T) const & this, counter_ptr(T) const & that);
+forall(T & | sized(T))
+int ?!=?(counter_ptr(T) const & this, counter_ptr(T) const & that);
+forall(T & | sized(T))
+int ?==?(counter_ptr(T) const & this, zero_t);
+forall(T & | sized(T))
+int ?!=?(counter_ptr(T) const & this, zero_t);
+        int ?==?(counter_ptr(T) const & this, counter_ptr(T) const & that);
+        int ?!=?(counter_ptr(T) const & this, counter_ptr(T) const & that);
+        int ?==?(counter_ptr(T) const & this, zero_t);
+        int ?!=?(counter_ptr(T) const & this, zero_t);
+}
 // This is the only pointer that keeps this alive.
 forall(T &)
 struct unique_ptr {
         T * data;
 };
+forall(T &) {
+        struct unique_ptr {
+                T * data;
+        };
+forall(T &)
+void ?{}(unique_ptr(T) & this);
+forall(T &)
+void ?{}(unique_ptr(T) & this, zero_t);
+forall(T &)
+void ?{}(unique_ptr(T) & this, unique_ptr(T) that) = void;
+forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
+void ?{}(unique_ptr(T) & this, Args args);
+        void ?{}(unique_ptr(T) & this);
+        void ?{}(unique_ptr(T) & this, zero_t);
+        void ?{}(unique_ptr(T) & this, unique_ptr(T) that) = void;
+        forall( | sized(T), Args... | { void ?{}(T &, Args); })
+        void ?{}(unique_ptr(T) & this, Args args);
 forall(T & | { void ^?{}(T &); })
 void ^?{}(unique_ptr(T) & this);
+        forall( | { void ^?{}(T &); })
+        void ^?{}(unique_ptr(T) & this);
+forall(T & )
+T & *?(unique_ptr(T) & this);
+        T & *?(unique_ptr(T) & this);
+forall(T &)
+void ?=?(unique_ptr(T) & this, unique_ptr(T) that) = void;
+forall(T & | { void ^?{}(T &); })
+void ?=?(unique_ptr(T) & this, zero_t);
+        void ?=?(unique_ptr(T) & this, unique_ptr(T) that) = void;
+        forall( | { void ^?{}(T &); })
+        void ?=?(unique_ptr(T) & this, zero_t);
 forall(T & | { void ^?{}(T &); })
 void move(unique_ptr(T) & this, unique_ptr(T) & that);
+        forall( | { void ^?{}(T &); })
+        void move(unique_ptr(T) & this, unique_ptr(T) & that);
+forall(T &)
+int ?==?(unique_ptr(T) const & this, unique_ptr(T) const & that);
+forall(T &)
+int ?!=?(unique_ptr(T) const & this, unique_ptr(T) const & that);
+forall(T &)
+int ?==?(unique_ptr(T) const & this, zero_t);
+forall(T &)
+int ?!=?(unique_ptr(T) const & this, zero_t);
+        int ?==?(unique_ptr(T) const & this, unique_ptr(T) const & that);
+        int ?!=?(unique_ptr(T) const & this, unique_ptr(T) const & that);
+        int ?==?(unique_ptr(T) const & this, zero_t);
+        int ?!=?(unique_ptr(T) const & this, zero_t);
+}

tests/smart-pointers.cfa

-              r3b402339
+              r144fa5c
 #include <memory.hfa>
 #include <assert.h>
+#include <stdlib.hfa>
 void counter_test(void) {
 …
+}
-void declare_test(void) {
-        counter_ptr(int) ptr_i0 = 3;
-        counter_ptr(char) ptr_c0 = 'a';
-        counter_ptr(float) ptr_f0 = 3.5f;
-        counter_ptr(double) ptr_d0 = 3.5;
-        unique_ptr(int) ptr_i1 = 3;
-        unique_ptr(char) ptr_c1 = 'a';
-        unique_ptr(float) ptr_f1 = 3.5f;
-        unique_ptr(double) ptr_d1 = 3.5;
+}
 int main(int argc, char * argv[]) {
         counter_test();
         unique_test();
         pointer_equality();
-        printf("done\n");
+}

Context Navigation

Changes in / [3b402339:144fa5c]

Legend:

benchmark/io/http/http_ring.cpp

doc/theses/andrew_beach_MMath/existing.tex

doc/theses/andrew_beach_MMath/features.tex

doc/theses/andrew_beach_MMath/implement.tex

doc/theses/andrew_beach_MMath/thesis-frontpgs.tex

doc/theses/andrew_beach_MMath/thesis.tex

doc/theses/andrew_beach_MMath/uw-ethesis-frontpgs.tex

doc/theses/andrew_beach_MMath/uw-ethesis.tex

libcfa/src/memory.cfa

libcfa/src/memory.hfa

tests/smart-pointers.cfa

Download in other formats: