src/buffer.c

Wed, 26 Nov 2025 23:35:25 +0100

author
Mike Becker <universe@uap-core.de>
date
Wed, 26 Nov 2025 23:35:25 +0100
changeset 1516
95b094472e9a
parent 1515
f024313c08f1
permissions
-rw-r--r--

fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold

483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved.
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/buffer.h"
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30
530
e866516cac17 #170 first buffer tests
Mike Becker <universe@uap-core.de>
parents: 529
diff changeset
31 #include <stdio.h>
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
32 #include <string.h>
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
33 #include <errno.h>
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
34
1292
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
35 #ifdef _WIN32
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
36 #include <Windows.h>
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
37 #include <sysinfoapi.h>
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
38 static unsigned long system_page_size() {
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
39 static unsigned long ps = 0;
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
40 if (ps == 0) {
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
41 SYSTEM_INFO sysinfo;
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
42 GetSystemInfo(&sysinfo);
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
43 ps = sysinfo.dwPageSize;
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
44 }
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
45 return ps;
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
46 }
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
47 #else
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
48 #include <unistd.h>
1501
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
49 static unsigned long system_page_size() {
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
50 static unsigned long ps = 0;
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
51 if (ps == 0) {
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
52 long sc = sysconf(_SC_PAGESIZE);
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
53 if (sc < 0) {
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
54 // fallback for systems which do not report a value here
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
55 ps = 4096; // LCOV_EXCL_LINE
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
56 } else {
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
57 ps = (unsigned long) sc;
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
58 }
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
59 }
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
60 return ps;
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
61 }
1292
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
62 #endif
1e7ee17777f4 add windows support for new buffer auto-extend strategy - relates to #641
Mike Becker <universe@uap-core.de>
parents: 1291
diff changeset
63
1028
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
64 static int buffer_copy_on_write(CxBuffer* buffer) {
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
65 if (0 == (buffer->flags & CX_BUFFER_COPY_ON_WRITE)) return 0;
1028
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
66 void *newspace = cxMalloc(buffer->allocator, buffer->capacity);
1501
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
67 if (NULL == newspace) return -1; // LCOV_EXCL_LINE
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
68 memcpy(newspace, buffer->space, buffer->size);
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
69 buffer->space = newspace;
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
70 buffer->flags &= ~CX_BUFFER_COPY_ON_WRITE;
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
71 buffer->flags |= CX_BUFFER_FREE_CONTENTS;
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
72 return 0;
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
73 }
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
74
501
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
75 int cxBufferInit(
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
76 CxBuffer *buffer,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
77 void *space,
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
78 size_t capacity,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 761
diff changeset
79 const CxAllocator *allocator,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
80 int flags
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
81 ) {
989
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
82 if (allocator == NULL) {
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
83 allocator = cxDefaultAllocator;
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
84 }
1028
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
85 if (flags & CX_BUFFER_COPY_ON_EXTEND) {
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
86 flags |= CX_BUFFER_AUTO_EXTEND;
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
87 }
501
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
88 buffer->allocator = allocator;
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
89 buffer->flags = flags;
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
90 if (!space) {
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
91 buffer->bytes = cxMalloc(allocator, capacity);
1501
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
92 if (buffer->bytes == NULL) return -1; // LCOV_EXCL_LINE
501
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
93 buffer->flags |= CX_BUFFER_FREE_CONTENTS;
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
94 } else {
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
95 buffer->bytes = space;
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
96 }
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
97 buffer->capacity = capacity;
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
98 buffer->size = 0;
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
99 buffer->pos = 0;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
100
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
101 buffer->flush = NULL;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
102
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
103 return 0;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
104 }
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
105
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
106 int cxBufferEnableFlushing(
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
107 CxBuffer *buffer,
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
108 CxBufferFlushConfig config
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
109 ) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
110 buffer->flush = cxMallocDefault(sizeof(CxBufferFlushConfig));
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
111 if (buffer->flush == NULL) return -1; // LCOV_EXCL_LINE
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
112 memcpy(buffer->flush, &config, sizeof(CxBufferFlushConfig));
501
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
113 return 0;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
114 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
115
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
116 void cxBufferDestroy(CxBuffer *buffer) {
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
117 if (buffer->flags & CX_BUFFER_FREE_CONTENTS) {
501
9a08f5e515cc add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents: 500
diff changeset
118 cxFree(buffer->allocator, buffer->bytes);
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
119 }
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
120 cxFreeDefault(buffer->flush);
1030
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
121 memset(buffer, 0, sizeof(CxBuffer));
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
122 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
123
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
124 CxBuffer *cxBufferCreate(
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
125 void *space,
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
126 size_t capacity,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 761
diff changeset
127 const CxAllocator *allocator,
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
128 int flags
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
129 ) {
989
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
130 if (allocator == NULL) {
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
131 allocator = cxDefaultAllocator;
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
132 }
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
133 CxBuffer *buf = cxMalloc(allocator, sizeof(CxBuffer));
1501
e60860db189f add fallback when sysconf() returns -1 when obtaining the page size
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
134 if (buf == NULL) return NULL; // LCOV_EXCL_LINE
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
135 if (0 == cxBufferInit(buf, space, capacity, allocator, flags)) {
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
136 return buf;
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
137 } else {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
138 // LCOV_EXCL_START
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
139 cxFree(allocator, buf);
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
140 return NULL;
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
141 // LCOV_EXCL_STOP
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
142 }
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
143 }
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
144
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
145 void cxBufferFree(CxBuffer *buffer) {
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 970
diff changeset
146 if (buffer == NULL) return;
1030
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
147 const CxAllocator *allocator = buffer->allocator;
991
ec49db06dae0 cxBufferFree() now calls cxBufferDestroy()
Mike Becker <universe@uap-core.de>
parents: 989
diff changeset
148 cxBufferDestroy(buffer);
1030
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
149 cxFree(allocator, buffer);
683
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
150 }
aa0d09f2d81c add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents: 673
diff changeset
151
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
152 int cxBufferSeek(
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
153 CxBuffer *buffer,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
154 off_t offset,
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
155 int whence
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
156 ) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
157 size_t npos;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
158 switch (whence) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
159 case SEEK_CUR:
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
160 npos = buffer->pos;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
161 break;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
162 case SEEK_END:
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
163 npos = buffer->size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
164 break;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
165 case SEEK_SET:
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
166 npos = 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
167 break;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
168 default:
1259
7bc999fe285d more documentation for buffer.h + set errno in cxBufferSeek() on invalid whence argument
Mike Becker <universe@uap-core.de>
parents: 1138
diff changeset
169 errno = EINVAL;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
170 return -1;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
171 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
172
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
173 size_t opos = npos;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
174 npos += offset;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
175
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
176 if ((offset > 0 && npos < opos) || (offset < 0 && npos > opos)) {
1288
b41ad5d9bcbf fixes errno value after failing cxBufferSeek() to be consistently EINVAL
Mike Becker <universe@uap-core.de>
parents: 1284
diff changeset
177 // to be compliant with fseek() specification
b41ad5d9bcbf fixes errno value after failing cxBufferSeek() to be consistently EINVAL
Mike Becker <universe@uap-core.de>
parents: 1284
diff changeset
178 // we return EINVAL on underflow
b41ad5d9bcbf fixes errno value after failing cxBufferSeek() to be consistently EINVAL
Mike Becker <universe@uap-core.de>
parents: 1284
diff changeset
179 errno = EINVAL;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
180 return -1;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
181 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
182
1007
81b2986d2b04 fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents: 1005
diff changeset
183 if (npos > buffer->size) {
1288
b41ad5d9bcbf fixes errno value after failing cxBufferSeek() to be consistently EINVAL
Mike Becker <universe@uap-core.de>
parents: 1284
diff changeset
184 // not compliant with fseek() specification
b41ad5d9bcbf fixes errno value after failing cxBufferSeek() to be consistently EINVAL
Mike Becker <universe@uap-core.de>
parents: 1284
diff changeset
185 // but this is the better behavior for CxBuffer
b41ad5d9bcbf fixes errno value after failing cxBufferSeek() to be consistently EINVAL
Mike Becker <universe@uap-core.de>
parents: 1284
diff changeset
186 errno = EINVAL;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
187 return -1;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
188 } else {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
189 buffer->pos = npos;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
190 return 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
191 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
192
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
193 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
194
1514
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
195 size_t cxBufferPop(CxBuffer *buffer, size_t size, size_t nitems) {
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
196 size_t len;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
197 if (cx_szmul(size, nitems, &len)) {
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
198 // LCOV_EXCL_START
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
199 errno = EOVERFLOW;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
200 return 0;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
201 // LCOV_EXCL_STOP
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
202 }
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
203 if (len == 0) return 0;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
204 if (len > buffer->size) {
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
205 if (size == 1) {
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
206 // simple case: everything can be discarded
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
207 len = buffer->size;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
208 } else {
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
209 // complicated case: misaligned bytes must stay
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
210 size_t misalignment = buffer->size % size;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
211 len = buffer->size - misalignment;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
212 }
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
213 }
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
214 buffer->size -= len;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
215
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
216 // adjust position, if required
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
217 if (buffer->pos > buffer->size) {
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
218 buffer->pos = buffer->size;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
219 }
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
220
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
221 return len / size;
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
222 }
ee5d668a71e4 add cxBufferPop()
Mike Becker <universe@uap-core.de>
parents: 1501
diff changeset
223
529
814d51173f20 #171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents: 501
diff changeset
224 void cxBufferClear(CxBuffer *buffer) {
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
225 if (0 == (buffer->flags & CX_BUFFER_COPY_ON_WRITE)) {
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
226 memset(buffer->bytes, 0, buffer->size);
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
227 }
529
814d51173f20 #171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents: 501
diff changeset
228 buffer->size = 0;
814d51173f20 #171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents: 501
diff changeset
229 buffer->pos = 0;
814d51173f20 #171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents: 501
diff changeset
230 }
814d51173f20 #171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents: 501
diff changeset
231
761
61d5197d612b add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents: 683
diff changeset
232 void cxBufferReset(CxBuffer *buffer) {
61d5197d612b add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents: 683
diff changeset
233 buffer->size = 0;
61d5197d612b add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents: 683
diff changeset
234 buffer->pos = 0;
61d5197d612b add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents: 683
diff changeset
235 }
61d5197d612b add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents: 683
diff changeset
236
1004
d8044fd5005c make cxBufferEof() return a bool
Mike Becker <universe@uap-core.de>
parents: 991
diff changeset
237 bool cxBufferEof(const CxBuffer *buffer) {
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
238 return buffer->pos >= buffer->size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
239 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
240
1515
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
241 int cxBufferReserve(CxBuffer *buffer, size_t newcap) {
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
242 if (newcap <= buffer->capacity) {
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
243 return 0;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
244 }
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
245 const int force_copy_flags = CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_COPY_ON_EXTEND;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
246 if (buffer->flags & force_copy_flags) {
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
247 void *newspace = cxMalloc(buffer->allocator, newcap);
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
248 if (NULL == newspace) return -1;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
249 memcpy(newspace, buffer->space, buffer->size);
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
250 buffer->space = newspace;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
251 buffer->capacity = newcap;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
252 buffer->flags &= ~force_copy_flags;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
253 buffer->flags |= CX_BUFFER_FREE_CONTENTS;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
254 return 0;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
255 } else if (cxReallocate(buffer->allocator,
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
256 (void **) &buffer->bytes, newcap) == 0) {
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
257 buffer->capacity = newcap;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
258 return 0;
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
259 } else {
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
260 return -1; // LCOV_EXCL_LINE
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
261 }
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
262 }
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
263
1516
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
264 static size_t cx_buffer_calculate_minimum_capacity(size_t mincap) {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
265 unsigned long pagesize = system_page_size();
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
266 // if page size is larger than 64 KB - for some reason - truncate to 64 KB
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
267 if (pagesize > 65536) pagesize = 65536;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
268 if (mincap < pagesize) {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
269 // when smaller as one page, map to the next power of two
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
270 mincap--;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
271 mincap |= mincap >> 1;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
272 mincap |= mincap >> 2;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
273 mincap |= mincap >> 4;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
274 // last operation only needed for pages larger 4096 bytes
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
275 // but if/else would be more expensive than just doing this
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
276 mincap |= mincap >> 8;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
277 mincap++;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
278 } else {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
279 // otherwise, map to a multiple of the page size
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
280 mincap -= mincap % pagesize;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
281 mincap += pagesize;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
282 // note: if newcap is already page aligned,
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
283 // this gives a full additional page (which is good)
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
284 }
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
285 return mincap;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
286 }
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
287
1515
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
288 int cxBufferMinimumCapacity(CxBuffer *buffer, size_t newcap) {
532
080c304ec176 fix cxBufferMinimumCapacity implementation still using additional_bytes
Mike Becker <universe@uap-core.de>
parents: 530
diff changeset
289 if (newcap <= buffer->capacity) {
080c304ec176 fix cxBufferMinimumCapacity implementation still using additional_bytes
Mike Becker <universe@uap-core.de>
parents: 530
diff changeset
290 return 0;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
291 }
1516
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
292 newcap = cx_buffer_calculate_minimum_capacity(newcap);
1515
f024313c08f1 add cxBufferReserve()
Mike Becker <universe@uap-core.de>
parents: 1514
diff changeset
293 return cxBufferReserve(buffer, newcap);
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
294 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
295
1290
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
296 void cxBufferShrink(
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
297 CxBuffer *buffer,
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
298 size_t reserve
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
299 ) {
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
300 // Ensure buffer is in a reallocatable state
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
301 const int force_copy_flags = CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_COPY_ON_EXTEND;
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
302 if (buffer->flags & force_copy_flags) {
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
303 // do nothing when we are not allowed to reallocate
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
304 return;
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
305 }
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
306
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
307 // calculate new capacity
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
308 size_t newCapacity = buffer->size + reserve;
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
309
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
310 // If new capacity is smaller than current capacity, resize the buffer
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
311 if (newCapacity < buffer->capacity) {
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
312 if (0 == cxReallocate(buffer->allocator, &buffer->bytes, newCapacity)) {
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
313 buffer->capacity = newCapacity;
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
314 }
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
315 }
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
316 }
4ac889e14211 adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents: 1288
diff changeset
317
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
318 static size_t cx_buffer_flush_helper(
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
319 const CxBuffer *buffer,
1128
3672b89e606c fix stupid signature of the flush helper
Mike Becker <universe@uap-core.de>
parents: 1110
diff changeset
320 const unsigned char *src,
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
321 size_t size,
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
322 size_t nitems
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
323 ) {
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
324 // flush data from an arbitrary source
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
325 // does not need to be the buffer's contents
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
326 size_t max_items = buffer->flush->blksize / size;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
327 size_t fblocks = 0;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
328 size_t flushed_total = 0;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
329 while (nitems > 0 && fblocks < buffer->flush->blkmax) {
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
330 fblocks++;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
331 size_t items = nitems > max_items ? max_items : nitems;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
332 size_t flushed = buffer->flush->wfunc(
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
333 src, size, items, buffer->flush->target);
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
334 if (flushed > 0) {
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
335 flushed_total += flushed;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
336 src += flushed * size;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
337 nitems -= flushed;
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
338 } else {
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
339 // if no bytes can be flushed out anymore, we give up
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
340 break;
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
341 }
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
342 }
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
343 return flushed_total;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
344 }
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
345
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
346 static size_t cx_buffer_flush_impl(CxBuffer *buffer, size_t size) {
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
347 // flush the current contents of the buffer
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
348 unsigned char *space = buffer->bytes;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
349 size_t remaining = buffer->pos / size;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
350 size_t flushed_total = cx_buffer_flush_helper(
1128
3672b89e606c fix stupid signature of the flush helper
Mike Becker <universe@uap-core.de>
parents: 1110
diff changeset
351 buffer, space, size, remaining);
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
352
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
353 // shift the buffer left after flushing
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
354 // IMPORTANT: up to this point, copy on write must have been
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
355 // performed already, because we can't do error handling here
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
356 cxBufferShiftLeft(buffer, flushed_total*size);
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
357
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
358 return flushed_total;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
359 }
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
360
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
361 size_t cxBufferFlush(CxBuffer *buffer) {
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
362 if (buffer_copy_on_write(buffer)) return 0;
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
363 return cx_buffer_flush_impl(buffer, 1);
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
364 }
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
365
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
366 size_t cxBufferWrite(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 761
diff changeset
367 const void *ptr,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
368 size_t size,
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
369 size_t nitems,
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
370 CxBuffer *buffer
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
371 ) {
543
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
372 // optimize for easy case
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
373 if (size == 1 && (buffer->capacity - buffer->pos) >= nitems) {
1028
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
374 if (buffer_copy_on_write(buffer)) return 0;
543
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
375 memcpy(buffer->bytes + buffer->pos, ptr, nitems);
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
376 buffer->pos += nitems;
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
377 if (buffer->pos > buffer->size) {
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
378 buffer->size = buffer->pos;
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
379 }
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
380 return nitems;
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
381 }
7b9114030ca4 optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents: 542
diff changeset
382
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
383 size_t len, total_flushed = 0;
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
384 cx_buffer_write_retry:
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
385 if (cx_szmul(size, nitems, &len)) {
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
386 errno = EOVERFLOW;
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
387 return total_flushed;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
388 }
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
389 if (buffer->pos > SIZE_MAX - len) {
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
390 errno = EOVERFLOW;
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
391 return total_flushed;
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
392 }
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
393
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
394 size_t required = buffer->pos + len;
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
395 bool perform_flush = false;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
396 if (required > buffer->capacity) {
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
397 if (buffer->flags & CX_BUFFER_AUTO_EXTEND) {
1516
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
398 if (buffer->flush != NULL) {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
399 size_t newcap = cx_buffer_calculate_minimum_capacity(required);
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
400 if (newcap > buffer->flush->threshold) {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
401 newcap = buffer->flush->threshold;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
402 }
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
403 if (cxBufferReserve(buffer, newcap)) {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
404 return total_flushed; // LCOV_EXCL_LINE
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
405 }
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
406 if (required > newcap) {
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
407 perform_flush = true;
95b094472e9a fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents: 1515
diff changeset
408 }
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
409 } else {
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
410 if (cxBufferMinimumCapacity(buffer, required)) {
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
411 return total_flushed; // LCOV_EXCL_LINE
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
412 }
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
413 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
414 } else {
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
415 if (buffer->flush != NULL) {
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
416 perform_flush = true;
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
417 } else {
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
418 // truncate data, if we can neither extend nor flush
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
419 len = buffer->capacity - buffer->pos;
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
420 if (size > 1) {
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
421 len -= len % size;
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
422 }
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
423 nitems = len / size;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
424 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
425 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
426 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
427
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
428 // check here and not above because of possible truncation
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
429 if (len == 0) {
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
430 return total_flushed;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
431 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
432
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
433 // check if we need to copy
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
434 if (buffer_copy_on_write(buffer)) return 0;
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
435
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
436 // perform the operation
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
437 if (perform_flush) {
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
438 size_t items_flushed;
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
439 if (buffer->pos == 0) {
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
440 // if we don't have data in the buffer, but are instructed
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
441 // to flush, it means that we are supposed to relay the data
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
442 items_flushed = cx_buffer_flush_helper(buffer, ptr, size, nitems);
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
443 if (items_flushed == 0) {
1135
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
444 // we needed to relay data, but could not flush anything
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
445 // i.e. we have to give up to avoid endless trying
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
446 return 0;
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
447 }
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
448 nitems -= items_flushed;
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
449 total_flushed += items_flushed;
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
450 if (nitems > 0) {
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
451 ptr = ((unsigned char*)ptr) + items_flushed * size;
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
452 goto cx_buffer_write_retry;
1128
3672b89e606c fix stupid signature of the flush helper
Mike Becker <universe@uap-core.de>
parents: 1110
diff changeset
453 }
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
454 return total_flushed;
1110
a0e9be7ed131 re-implement flushing
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
455 } else {
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
456 items_flushed = cx_buffer_flush_impl(buffer, size);
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
457 if (items_flushed == 0) {
1135
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
458 // flush target is full, let's try to truncate
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
459 size_t remaining_space;
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
460 if (buffer->flags & CX_BUFFER_AUTO_EXTEND) {
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
461 remaining_space = buffer->flush->threshold > buffer->pos
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
462 ? buffer->flush->threshold - buffer->pos
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
463 : 0;
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
464 } else {
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
465 remaining_space = buffer->capacity > buffer->pos
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
466 ? buffer->capacity - buffer->pos
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
467 : 0;
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
468 }
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
469 nitems = remaining_space / size;
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
470 if (nitems == 0) {
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
471 return total_flushed;
1135
f79415d974d3 add test case for flushing when target is full and fixes a bug related to that
Mike Becker <universe@uap-core.de>
parents: 1131
diff changeset
472 }
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
473 }
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
474 goto cx_buffer_write_retry;
544
2e73456e5f84 #184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 543
diff changeset
475 }
539
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
476 } else {
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
477 memcpy(buffer->bytes + buffer->pos, ptr, len);
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
478 buffer->pos += len;
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
479 if (buffer->pos > buffer->size) {
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
480 buffer->size = buffer->pos;
9cd98da9ee17 #184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents: 538
diff changeset
481 }
1138
29672c777a28 avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents: 1135
diff changeset
482 return total_flushed + nitems;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
483 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
484 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
485
1030
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
486 size_t cxBufferAppend(
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
487 const void *ptr,
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
488 size_t size,
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
489 size_t nitems,
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
490 CxBuffer *buffer
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
491 ) {
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
492 size_t pos = buffer->pos;
1131
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
493 size_t append_pos = buffer->size;
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
494 buffer->pos = append_pos;
1030
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
495 size_t written = cxBufferWrite(ptr, size, nitems, buffer);
1131
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
496 // the buffer might have been flushed
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
497 // we must compute a possible delta for the position
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
498 // expected: pos = append_pos + written
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
499 // -> if this is not the case, there is a delta
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
500 size_t delta = append_pos + written*size - buffer->pos;
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
501 if (delta > pos) {
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
502 buffer->pos = 0;
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
503 } else {
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
504 buffer->pos = pos - delta;
644f77f903b1 fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents: 1128
diff changeset
505 }
1030
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
506 return written;
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
507 }
06091e067bee add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents: 1028
diff changeset
508
538
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
509 int cxBufferPut(
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
510 CxBuffer *buffer,
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
511 int c
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
512 ) {
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
513 c &= 0xFF;
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
514 unsigned char const ch = c;
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
515 if (cxBufferWrite(&ch, 1, 1, buffer) == 1) {
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
516 return c;
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
517 } else {
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
518 return EOF;
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
519 }
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
520 }
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
521
1005
67fa386ce600 add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents: 1004
diff changeset
522 int cxBufferTerminate(CxBuffer *buffer) {
1284
b2103354baed fix implementation of cxBufferTerminate() - fixes #631
Mike Becker <universe@uap-core.de>
parents: 1259
diff changeset
523 if (0 == cxBufferPut(buffer, 0)) {
b2103354baed fix implementation of cxBufferTerminate() - fixes #631
Mike Becker <universe@uap-core.de>
parents: 1259
diff changeset
524 buffer->size = buffer->pos - 1;
1005
67fa386ce600 add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents: 1004
diff changeset
525 return 0;
67fa386ce600 add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents: 1004
diff changeset
526 } else {
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
527 return -1;
1005
67fa386ce600 add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents: 1004
diff changeset
528 }
67fa386ce600 add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents: 1004
diff changeset
529 }
67fa386ce600 add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents: 1004
diff changeset
530
538
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
531 size_t cxBufferPutString(
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
532 CxBuffer *buffer,
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
533 const char *str
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
534 ) {
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
535 return cxBufferWrite(str, 1, strlen(str), buffer);
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
536 }
2cfbcbe86a7c #170 first basic write tests
Mike Becker <universe@uap-core.de>
parents: 536
diff changeset
537
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
538 size_t cxBufferRead(
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
539 void *ptr,
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
540 size_t size,
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
541 size_t nitems,
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
542 CxBuffer *buffer
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
543 ) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
544 size_t len;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
545 if (cx_szmul(size, nitems, &len)) {
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
546 errno = EOVERFLOW;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
547 return 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
548 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
549 if (buffer->pos + len > buffer->size) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
550 len = buffer->size - buffer->pos;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
551 if (size > 1) len -= len % size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
552 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
553
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
554 if (len <= 0) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
555 return len;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
556 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
557
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
558 memcpy(ptr, buffer->bytes + buffer->pos, len);
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
559 buffer->pos += len;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
560
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
561 return len / size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
562 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
563
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
564 int cxBufferGet(CxBuffer *buffer) {
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
565 if (cxBufferEof(buffer)) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
566 return EOF;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
567 } else {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
568 int c = buffer->bytes[buffer->pos];
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
569 buffer->pos++;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
570 return c;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
571 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
572 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
573
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
574 int cxBufferShiftLeft(
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
575 CxBuffer *buffer,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
576 size_t shift
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
577 ) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
578 if (shift >= buffer->size) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
579 buffer->pos = buffer->size = 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
580 } else {
1028
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
581 if (buffer_copy_on_write(buffer)) return -1;
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
582 memmove(buffer->bytes, buffer->bytes + shift, buffer->size - shift);
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
583 buffer->size -= shift;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
584
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
585 if (buffer->pos >= shift) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
586 buffer->pos -= shift;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
587 } else {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
588 buffer->pos = 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
589 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
590 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
591 return 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
592 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
593
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
594 int cxBufferShiftRight(
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
595 CxBuffer *buffer,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
596 size_t shift
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
597 ) {
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
598 if (buffer->size > SIZE_MAX - shift) {
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
599 errno = EOVERFLOW;
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
600 return -1;
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1030
diff changeset
601 }
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
602 size_t req_capacity = buffer->size + shift;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
603 size_t movebytes;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
604
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
605 // auto extend buffer, if required and enabled
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
606 if (buffer->capacity < req_capacity) {
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
607 if (buffer->flags & CX_BUFFER_AUTO_EXTEND) {
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
608 if (cxBufferMinimumCapacity(buffer, req_capacity)) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
609 return -1; // LCOV_EXCL_LINE
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
610 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
611 movebytes = buffer->size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
612 } else {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
613 movebytes = buffer->capacity - shift;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
614 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
615 } else {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
616 movebytes = buffer->size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
617 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
618
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
619 if (movebytes > 0) {
1028
3e4905241838 add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents: 1018
diff changeset
620 if (buffer_copy_on_write(buffer)) return -1;
1018
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
621 memmove(buffer->bytes + shift, buffer->bytes, movebytes);
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
622 buffer->size = shift + movebytes;
8f99f6c28bd3 add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
623 }
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
624
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
625 buffer->pos += shift;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
626 if (buffer->pos > buffer->size) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
627 buffer->pos = buffer->size;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
628 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
629
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
630 return 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
631 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
632
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
633 int cxBufferShift(
500
eb9e7bd40a8e do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
634 CxBuffer *buffer,
483
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
635 off_t shift
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
636 ) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
637 if (shift < 0) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
638 return cxBufferShiftLeft(buffer, (size_t) (-shift));
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
639 } else if (shift > 0) {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
640 return cxBufferShiftRight(buffer, (size_t) shift);
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
641 } else {
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
642 return 0;
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
643 }
929016224c3c add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff changeset
644 }

mercurial