Fri, 05 Dec 2025 16:38:17 +0100
change cxBufferReserve() to allow reducing the capacity
resolves #773
|
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 | 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 | |
|
1028
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents:
1018
diff
changeset
|
35 | 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
|
36 | 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
|
37 | 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
|
38 | 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
|
39 | 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
|
40 | buffer->space = newspace; |
|
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
41 | 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
|
42 | 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
|
43 | return 0; |
|
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
44 | } |
|
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
45 | |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
46 | int cxBufferInit( |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
47 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
48 | void *space, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
49 | size_t capacity, |
|
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
761
diff
changeset
|
50 | const CxAllocator *allocator, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
51 | int flags |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | ) { |
|
989
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
53 | if (allocator == NULL) { |
|
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
54 | allocator = cxDefaultAllocator; |
|
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
55 | } |
|
1028
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents:
1018
diff
changeset
|
56 | 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
|
57 | 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
|
58 | } |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
59 | buffer->allocator = allocator; |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
60 | buffer->flags = flags; |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
61 | if (!space) { |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
62 | 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
|
63 | 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
|
64 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
65 | } else { |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
66 | buffer->bytes = space; |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
67 | } |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
68 | buffer->capacity = capacity; |
|
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
69 | buffer->size = 0; |
|
539
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
70 | buffer->pos = 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
71 | |
| 1110 | 72 | buffer->flush = NULL; |
| 73 | ||
| 74 | return 0; | |
| 75 | } | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
76 | |
| 1110 | 77 | int cxBufferEnableFlushing( |
| 78 | CxBuffer *buffer, | |
| 79 | CxBufferFlushConfig config | |
| 80 | ) { | |
|
1319
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents:
1318
diff
changeset
|
81 | buffer->flush = cxMallocDefault(sizeof(CxBufferFlushConfig)); |
| 1110 | 82 | if (buffer->flush == NULL) return -1; // LCOV_EXCL_LINE |
| 83 | memcpy(buffer->flush, &config, sizeof(CxBufferFlushConfig)); | |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
84 | return 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
85 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
86 | |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
87 | 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
|
88 | if (buffer->flags & CX_BUFFER_FREE_CONTENTS) { |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
89 | cxFree(buffer->allocator, buffer->bytes); |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
90 | } |
|
1319
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents:
1318
diff
changeset
|
91 | cxFreeDefault(buffer->flush); |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
92 | memset(buffer, 0, sizeof(CxBuffer)); |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
93 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
94 | |
|
683
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
95 | CxBuffer *cxBufferCreate( |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
96 | void *space, |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
97 | size_t capacity, |
|
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
761
diff
changeset
|
98 | 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
|
99 | int flags |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
100 | ) { |
|
989
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
101 | if (allocator == NULL) { |
|
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
102 | allocator = cxDefaultAllocator; |
|
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
103 | } |
|
683
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
104 | 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
|
105 | 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
|
106 | 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
|
107 | return buf; |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
108 | } else { |
|
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
109 | // 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
|
110 | cxFree(allocator, buf); |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
111 | return NULL; |
|
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
112 | // 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
|
113 | } |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
114 | } |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
115 | |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
116 | void cxBufferFree(CxBuffer *buffer) { |
|
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
970
diff
changeset
|
117 | if (buffer == NULL) return; |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
118 | const CxAllocator *allocator = buffer->allocator; |
|
991
ec49db06dae0
cxBufferFree() now calls cxBufferDestroy()
Mike Becker <universe@uap-core.de>
parents:
989
diff
changeset
|
119 | cxBufferDestroy(buffer); |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
120 | 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
|
121 | } |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
122 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
123 | int cxBufferSeek( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
124 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
125 | off_t offset, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
126 | int whence |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
127 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
128 | size_t npos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
129 | switch (whence) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
130 | case SEEK_CUR: |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
131 | npos = buffer->pos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
132 | break; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
133 | case SEEK_END: |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
134 | npos = buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
135 | break; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
136 | case SEEK_SET: |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
137 | npos = 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
138 | break; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
139 | 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
|
140 | errno = EINVAL; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
141 | return -1; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
142 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
143 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
144 | size_t opos = npos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
145 | npos += offset; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
146 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
147 | 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
|
148 | // 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
|
149 | // 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
|
150 | errno = EINVAL; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
151 | return -1; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
152 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
153 | |
|
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1005
diff
changeset
|
154 | 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
|
155 | // 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
|
156 | // 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
|
157 | errno = EINVAL; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
158 | return -1; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
159 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
160 | buffer->pos = npos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
161 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
162 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
163 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
164 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
165 | |
| 1514 | 166 | size_t cxBufferPop(CxBuffer *buffer, size_t size, size_t nitems) { |
| 167 | size_t len; | |
| 168 | if (cx_szmul(size, nitems, &len)) { | |
| 169 | // LCOV_EXCL_START | |
| 170 | errno = EOVERFLOW; | |
| 171 | return 0; | |
| 172 | // LCOV_EXCL_STOP | |
| 173 | } | |
| 174 | if (len == 0) return 0; | |
| 175 | if (len > buffer->size) { | |
| 176 | if (size == 1) { | |
| 177 | // simple case: everything can be discarded | |
| 178 | len = buffer->size; | |
| 179 | } else { | |
| 180 | // complicated case: misaligned bytes must stay | |
| 181 | size_t misalignment = buffer->size % size; | |
| 182 | len = buffer->size - misalignment; | |
| 183 | } | |
| 184 | } | |
| 185 | buffer->size -= len; | |
| 186 | ||
| 187 | // adjust position, if required | |
| 188 | if (buffer->pos > buffer->size) { | |
| 189 | buffer->pos = buffer->size; | |
| 190 | } | |
| 191 | ||
| 192 | return len / size; | |
| 193 | } | |
| 194 | ||
|
529
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
195 | 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
|
196 | 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
|
197 | 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
|
198 | } |
|
529
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
199 | buffer->size = 0; |
|
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
200 | buffer->pos = 0; |
|
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
201 | } |
|
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
202 | |
|
761
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
203 | void cxBufferReset(CxBuffer *buffer) { |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
204 | buffer->size = 0; |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
205 | buffer->pos = 0; |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
206 | } |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
207 | |
|
1004
d8044fd5005c
make cxBufferEof() return a bool
Mike Becker <universe@uap-core.de>
parents:
991
diff
changeset
|
208 | bool cxBufferEof(const CxBuffer *buffer) { |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
209 | return buffer->pos >= buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
210 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
211 | |
| 1515 | 212 | int cxBufferReserve(CxBuffer *buffer, size_t newcap) { |
|
1542
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
213 | if (newcap == buffer->capacity) { |
| 1515 | 214 | return 0; |
| 215 | } | |
| 216 | const int force_copy_flags = CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_COPY_ON_EXTEND; | |
| 217 | if (buffer->flags & force_copy_flags) { | |
| 218 | void *newspace = cxMalloc(buffer->allocator, newcap); | |
| 219 | if (NULL == newspace) return -1; | |
| 220 | memcpy(newspace, buffer->space, buffer->size); | |
| 221 | buffer->space = newspace; | |
| 222 | buffer->capacity = newcap; | |
| 223 | buffer->flags &= ~force_copy_flags; | |
| 224 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; | |
| 225 | return 0; | |
| 226 | } else if (cxReallocate(buffer->allocator, | |
| 227 | (void **) &buffer->bytes, newcap) == 0) { | |
|
1542
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
228 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; |
| 1515 | 229 | buffer->capacity = newcap; |
|
1542
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
230 | if (buffer->size > newcap) { |
|
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
231 | buffer->size = newcap; |
|
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
232 | } |
| 1515 | 233 | return 0; |
| 234 | } else { | |
| 235 | return -1; // LCOV_EXCL_LINE | |
| 236 | } | |
| 237 | } | |
| 238 | ||
|
1516
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
239 | static size_t cx_buffer_calculate_minimum_capacity(size_t mincap) { |
|
1539
2cbdb482d325
add cx_system_page_size() to allocator.h
Mike Becker <universe@uap-core.de>
parents:
1520
diff
changeset
|
240 | unsigned long pagesize = cx_system_page_size(); |
|
1516
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
241 | // 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
|
242 | 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
|
243 | 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
|
244 | // 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
|
245 | mincap--; |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
246 | 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
|
247 | 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
|
248 | 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
|
249 | // 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
|
250 | // 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
|
251 | 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
|
252 | mincap++; |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
253 | } else { |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
254 | // 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
|
255 | 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
|
256 | 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
|
257 | // 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
|
258 | // 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
|
259 | } |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
260 | 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
|
261 | } |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
262 | |
| 1515 | 263 | 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
|
264 | if (newcap <= buffer->capacity) { |
|
080c304ec176
fix cxBufferMinimumCapacity implementation still using additional_bytes
Mike Becker <universe@uap-core.de>
parents:
530
diff
changeset
|
265 | return 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
266 | } |
|
1516
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
267 | newcap = cx_buffer_calculate_minimum_capacity(newcap); |
| 1515 | 268 | return cxBufferReserve(buffer, newcap); |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
269 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
270 | |
|
1290
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
271 | void cxBufferShrink( |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
272 | CxBuffer *buffer, |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
273 | size_t reserve |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
274 | ) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
275 | // Ensure buffer is in a reallocatable state |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
276 | 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
|
277 | if (buffer->flags & force_copy_flags) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
278 | // do nothing when we are not allowed to reallocate |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
279 | return; |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
280 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
281 | |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
282 | // calculate new capacity |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
283 | size_t newCapacity = buffer->size + reserve; |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
284 | |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
285 | // 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
|
286 | if (newCapacity < buffer->capacity) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
287 | if (0 == cxReallocate(buffer->allocator, &buffer->bytes, newCapacity)) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
288 | buffer->capacity = newCapacity; |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
289 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
290 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
291 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
292 | |
| 1110 | 293 | static size_t cx_buffer_flush_helper( |
| 294 | const CxBuffer *buffer, | |
|
1128
3672b89e606c
fix stupid signature of the flush helper
Mike Becker <universe@uap-core.de>
parents:
1110
diff
changeset
|
295 | const unsigned char *src, |
|
544
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
296 | size_t size, |
|
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
297 | size_t nitems |
|
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
298 | ) { |
| 1110 | 299 | // flush data from an arbitrary source |
| 300 | // does not need to be the buffer's contents | |
| 301 | size_t max_items = buffer->flush->blksize / size; | |
| 302 | size_t fblocks = 0; | |
| 303 | size_t flushed_total = 0; | |
| 304 | while (nitems > 0 && fblocks < buffer->flush->blkmax) { | |
| 305 | fblocks++; | |
| 306 | size_t items = nitems > max_items ? max_items : nitems; | |
| 307 | size_t flushed = buffer->flush->wfunc( | |
| 308 | 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
|
309 | if (flushed > 0) { |
| 1110 | 310 | flushed_total += flushed; |
| 311 | src += flushed * size; | |
| 312 | nitems -= flushed; | |
|
544
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
313 | } else { |
|
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
314 | // 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
|
315 | break; |
|
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
316 | } |
|
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
317 | } |
| 1110 | 318 | return flushed_total; |
| 319 | } | |
| 320 | ||
| 321 | static size_t cx_buffer_flush_impl(CxBuffer *buffer, size_t size) { | |
| 322 | // flush the current contents of the buffer | |
| 323 | unsigned char *space = buffer->bytes; | |
| 324 | size_t remaining = buffer->pos / size; | |
| 325 | 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
|
326 | buffer, space, size, remaining); |
| 1110 | 327 | |
| 328 | // shift the buffer left after flushing | |
| 329 | // IMPORTANT: up to this point, copy on write must have been | |
| 330 | // performed already, because we can't do error handling here | |
| 331 | cxBufferShiftLeft(buffer, flushed_total*size); | |
| 332 | ||
| 333 | return flushed_total; | |
| 334 | } | |
| 335 | ||
| 336 | size_t cxBufferFlush(CxBuffer *buffer) { | |
| 337 | if (buffer_copy_on_write(buffer)) return 0; | |
| 338 | 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
|
339 | } |
|
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
340 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
341 | size_t cxBufferWrite( |
|
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
761
diff
changeset
|
342 | const void *ptr, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
343 | size_t size, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
344 | size_t nitems, |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
345 | CxBuffer *buffer |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
346 | ) { |
|
543
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
347 | // optimize for easy case |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
348 | 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
|
349 | 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
|
350 | memcpy(buffer->bytes + buffer->pos, ptr, nitems); |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
351 | buffer->pos += nitems; |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
352 | if (buffer->pos > buffer->size) { |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
353 | buffer->size = buffer->pos; |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
354 | } |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
355 | return nitems; |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
356 | } |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
357 | |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
358 | size_t len, total_flushed = 0; |
|
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
359 | cx_buffer_write_retry: |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
360 | 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
|
361 | errno = EOVERFLOW; |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
362 | return total_flushed; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
363 | } |
| 1110 | 364 | if (buffer->pos > SIZE_MAX - len) { |
| 365 | errno = EOVERFLOW; | |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
366 | return total_flushed; |
| 1110 | 367 | } |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
368 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
369 | 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
|
370 | bool perform_flush = false; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
371 | 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
|
372 | 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
|
373 | 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
|
374 | 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
|
375 | 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
|
376 | 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
|
377 | } |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
378 | 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
|
379 | 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
|
380 | } |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
381 | 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
|
382 | 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
|
383 | } |
|
539
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
384 | } else { |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
385 | if (cxBufferMinimumCapacity(buffer, required)) { |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
386 | 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
|
387 | } |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
388 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
389 | } else { |
| 1110 | 390 | if (buffer->flush != NULL) { |
|
539
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
391 | perform_flush = true; |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
392 | } else { |
| 1110 | 393 | // 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
|
394 | len = buffer->capacity - buffer->pos; |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
395 | if (size > 1) { |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
396 | len -= len % size; |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
397 | } |
| 1110 | 398 | nitems = len / size; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
399 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
400 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
401 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
402 | |
| 1110 | 403 | // 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
|
404 | if (len == 0) { |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
405 | return total_flushed; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
406 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
407 | |
| 1110 | 408 | // check if we need to copy |
| 409 | 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
|
410 | |
| 1110 | 411 | // perform the operation |
| 412 | if (perform_flush) { | |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
413 | size_t items_flushed; |
| 1110 | 414 | if (buffer->pos == 0) { |
| 415 | // if we don't have data in the buffer, but are instructed | |
| 416 | // 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
|
417 | 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
|
418 | 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
|
419 | // 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
|
420 | // i.e. we have to give up to avoid endless trying |
| 1110 | 421 | return 0; |
|
544
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
422 | } |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
423 | nitems -= items_flushed; |
|
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
424 | total_flushed += items_flushed; |
|
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
425 | if (nitems > 0) { |
|
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
426 | ptr = ((unsigned char*)ptr) + items_flushed * size; |
|
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
427 | goto cx_buffer_write_retry; |
|
1128
3672b89e606c
fix stupid signature of the flush helper
Mike Becker <universe@uap-core.de>
parents:
1110
diff
changeset
|
428 | } |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
429 | return total_flushed; |
| 1110 | 430 | } else { |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
431 | 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
|
432 | 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
|
433 | // 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
|
434 | 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
|
435 | 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
|
436 | 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
|
437 | ? 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
|
438 | : 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
|
439 | } 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
|
440 | 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
|
441 | ? 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
|
442 | : 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
|
443 | } |
|
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 | 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
|
445 | if (nitems == 0) { |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
446 | 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
|
447 | } |
|
544
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
448 | } |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
449 | goto cx_buffer_write_retry; |
|
544
2e73456e5f84
#184 untested implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
543
diff
changeset
|
450 | } |
|
539
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
451 | } else { |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
452 | 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
|
453 | buffer->pos += len; |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
454 | if (buffer->pos > buffer->size) { |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
455 | buffer->size = buffer->pos; |
|
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
456 | } |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
457 | return total_flushed + nitems; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
458 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
459 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
460 | |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
461 | size_t cxBufferAppend( |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
462 | const void *ptr, |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
463 | size_t size, |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
464 | size_t nitems, |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
465 | CxBuffer *buffer |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
466 | ) { |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
467 | size_t pos = buffer->pos; |
|
1131
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
468 | size_t append_pos = buffer->size; |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
469 | buffer->pos = append_pos; |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
470 | 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
|
471 | // the buffer might have been flushed |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
472 | // 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
|
473 | // expected: pos = append_pos + written |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
474 | // -> 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
|
475 | 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
|
476 | if (delta > pos) { |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
477 | buffer->pos = 0; |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
478 | } else { |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
479 | buffer->pos = pos - delta; |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
480 | } |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
481 | return written; |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
482 | } |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
483 | |
|
538
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
484 | int cxBufferPut( |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
485 | CxBuffer *buffer, |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
486 | int c |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
487 | ) { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
488 | c &= 0xFF; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
489 | unsigned char const ch = c; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
490 | if (cxBufferWrite(&ch, 1, 1, buffer) == 1) { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
491 | return c; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
492 | } else { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
493 | return EOF; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
494 | } |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
495 | } |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
496 | |
|
1005
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
497 | int cxBufferTerminate(CxBuffer *buffer) { |
|
1284
b2103354baed
fix implementation of cxBufferTerminate() - fixes #631
Mike Becker <universe@uap-core.de>
parents:
1259
diff
changeset
|
498 | if (0 == cxBufferPut(buffer, 0)) { |
|
b2103354baed
fix implementation of cxBufferTerminate() - fixes #631
Mike Becker <universe@uap-core.de>
parents:
1259
diff
changeset
|
499 | buffer->size = buffer->pos - 1; |
|
1005
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
500 | return 0; |
|
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
501 | } else { |
|
1018
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
502 | return -1; |
|
1005
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
503 | } |
|
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
504 | } |
|
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
505 | |
|
538
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
506 | size_t cxBufferPutString( |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
507 | CxBuffer *buffer, |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
508 | const char *str |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
509 | ) { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
510 | return cxBufferWrite(str, 1, strlen(str), buffer); |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
511 | } |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
512 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
513 | size_t cxBufferRead( |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
514 | void *ptr, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
515 | size_t size, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
516 | size_t nitems, |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
517 | CxBuffer *buffer |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
518 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
519 | size_t len; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
520 | 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
|
521 | errno = EOVERFLOW; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
522 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
523 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
524 | if (buffer->pos + len > buffer->size) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
525 | len = buffer->size - buffer->pos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
526 | if (size > 1) len -= len % size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
527 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
528 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
529 | if (len <= 0) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
530 | return len; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
531 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
532 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
533 | memcpy(ptr, buffer->bytes + buffer->pos, len); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
534 | buffer->pos += len; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
535 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
536 | return len / size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
537 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
538 | |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
539 | int cxBufferGet(CxBuffer *buffer) { |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
540 | if (cxBufferEof(buffer)) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
541 | return EOF; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
542 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
543 | int c = buffer->bytes[buffer->pos]; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
544 | buffer->pos++; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
545 | return c; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
546 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
547 | } |
|
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 | int cxBufferShiftLeft( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
550 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
551 | size_t shift |
|
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 | if (shift >= buffer->size) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
554 | buffer->pos = buffer->size = 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
555 | } else { |
|
1028
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents:
1018
diff
changeset
|
556 | if (buffer_copy_on_write(buffer)) return -1; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
557 | memmove(buffer->bytes, buffer->bytes + shift, buffer->size - shift); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
558 | buffer->size -= shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
559 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
560 | if (buffer->pos >= shift) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
561 | buffer->pos -= shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
562 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
563 | buffer->pos = 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
564 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
565 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
566 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
567 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
568 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
569 | int cxBufferShiftRight( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
570 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
571 | size_t shift |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
572 | ) { |
|
1040
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents:
1030
diff
changeset
|
573 | 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
|
574 | 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
|
575 | 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
|
576 | } |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
577 | size_t req_capacity = buffer->size + shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
578 | size_t movebytes; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
579 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
580 | // auto extend buffer, if required and enabled |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
581 | 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
|
582 | if (buffer->flags & CX_BUFFER_AUTO_EXTEND) { |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
583 | if (cxBufferMinimumCapacity(buffer, req_capacity)) { |
|
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
584 | return -1; // LCOV_EXCL_LINE |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
585 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
586 | movebytes = buffer->size; |
|
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 | movebytes = buffer->capacity - shift; |
|
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 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
591 | movebytes = buffer->size; |
|
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 | |
|
1018
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
594 | 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
|
595 | 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
|
596 | 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
|
597 | 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
|
598 | } |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
599 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
600 | buffer->pos += shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
601 | if (buffer->pos > buffer->size) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
602 | buffer->pos = buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
603 | } |
|
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 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
606 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
607 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
608 | int cxBufferShift( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
609 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
610 | off_t shift |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
611 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
612 | if (shift < 0) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
613 | return cxBufferShiftLeft(buffer, (size_t) (-shift)); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
614 | } else if (shift > 0) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
615 | return cxBufferShiftRight(buffer, (size_t) shift); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
616 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
617 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
618 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
619 | } |