Thu, 11 Dec 2025 17:08:17 +0100
removes buffer flush and adds maximum capacity instead - resolves #185
|
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; |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
69 | buffer->max_capacity = SIZE_MAX; |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
70 | buffer->size = 0; |
|
539
9cd98da9ee17
#184 start implementation of the flush feature
Mike Becker <universe@uap-core.de>
parents:
538
diff
changeset
|
71 | buffer->pos = 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
72 | |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
73 | return 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
74 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
75 | |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
76 | 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
|
77 | if (buffer->flags & CX_BUFFER_FREE_CONTENTS) { |
|
501
9a08f5e515cc
add allocator support to CxBuffer
Mike Becker <universe@uap-core.de>
parents:
500
diff
changeset
|
78 | cxFree(buffer->allocator, buffer->bytes); |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
79 | } |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
80 | memset(buffer, 0, sizeof(CxBuffer)); |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
81 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
82 | |
|
683
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
83 | CxBuffer *cxBufferCreate( |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
84 | void *space, |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
85 | size_t capacity, |
|
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
761
diff
changeset
|
86 | 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
|
87 | int flags |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
88 | ) { |
|
989
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
89 | if (allocator == NULL) { |
|
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
90 | allocator = cxDefaultAllocator; |
|
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
91 | } |
|
683
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
92 | 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
|
93 | 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
|
94 | 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
|
95 | return buf; |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
96 | } else { |
|
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
97 | // 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
|
98 | cxFree(allocator, buf); |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
99 | return NULL; |
|
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
100 | // 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
|
101 | } |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
102 | } |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
103 | |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
104 | void cxBufferFree(CxBuffer *buffer) { |
|
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
970
diff
changeset
|
105 | if (buffer == NULL) return; |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
106 | const CxAllocator *allocator = buffer->allocator; |
|
991
ec49db06dae0
cxBufferFree() now calls cxBufferDestroy()
Mike Becker <universe@uap-core.de>
parents:
989
diff
changeset
|
107 | cxBufferDestroy(buffer); |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
108 | 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
|
109 | } |
|
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
Mike Becker <universe@uap-core.de>
parents:
673
diff
changeset
|
110 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
111 | int cxBufferSeek( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
112 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
113 | off_t offset, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
114 | int whence |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
115 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
116 | size_t npos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
117 | switch (whence) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
118 | case SEEK_CUR: |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
119 | npos = buffer->pos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
120 | break; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
121 | case SEEK_END: |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
122 | npos = buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
123 | break; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
124 | case SEEK_SET: |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
125 | npos = 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
126 | break; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
127 | 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
|
128 | errno = EINVAL; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
129 | return -1; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
130 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
131 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
132 | size_t opos = npos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
133 | npos += offset; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
134 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
135 | 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
|
136 | // 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
|
137 | // 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
|
138 | errno = EINVAL; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
139 | return -1; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
140 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
141 | |
|
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1005
diff
changeset
|
142 | 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
|
143 | // 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
|
144 | // 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
|
145 | errno = EINVAL; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
146 | return -1; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
147 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
148 | buffer->pos = npos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
149 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
150 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
151 | |
|
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 | |
| 1514 | 154 | size_t cxBufferPop(CxBuffer *buffer, size_t size, size_t nitems) { |
| 155 | size_t len; | |
| 156 | if (cx_szmul(size, nitems, &len)) { | |
| 157 | // LCOV_EXCL_START | |
| 158 | errno = EOVERFLOW; | |
| 159 | return 0; | |
| 160 | // LCOV_EXCL_STOP | |
| 161 | } | |
| 162 | if (len == 0) return 0; | |
| 163 | if (len > buffer->size) { | |
| 164 | if (size == 1) { | |
| 165 | // simple case: everything can be discarded | |
| 166 | len = buffer->size; | |
| 167 | } else { | |
| 168 | // complicated case: misaligned bytes must stay | |
| 169 | size_t misalignment = buffer->size % size; | |
| 170 | len = buffer->size - misalignment; | |
| 171 | } | |
| 172 | } | |
| 173 | buffer->size -= len; | |
| 174 | ||
| 175 | // adjust position, if required | |
| 176 | if (buffer->pos > buffer->size) { | |
| 177 | buffer->pos = buffer->size; | |
| 178 | } | |
| 179 | ||
| 180 | return len / size; | |
| 181 | } | |
| 182 | ||
|
529
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
183 | 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
|
184 | 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
|
185 | 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
|
186 | } |
|
529
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
187 | buffer->size = 0; |
|
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
188 | buffer->pos = 0; |
|
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
189 | } |
|
814d51173f20
#171 const qualifier and nonnull attributes
Mike Becker <universe@uap-core.de>
parents:
501
diff
changeset
|
190 | |
|
761
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
191 | void cxBufferReset(CxBuffer *buffer) { |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
192 | buffer->size = 0; |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
193 | buffer->pos = 0; |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
194 | } |
|
61d5197d612b
add cxBufferReset() - resolves #338
Mike Becker <universe@uap-core.de>
parents:
683
diff
changeset
|
195 | |
|
1004
d8044fd5005c
make cxBufferEof() return a bool
Mike Becker <universe@uap-core.de>
parents:
991
diff
changeset
|
196 | bool cxBufferEof(const CxBuffer *buffer) { |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
197 | return buffer->pos >= buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
198 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
199 | |
| 1515 | 200 | 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
|
201 | if (newcap == buffer->capacity) { |
| 1515 | 202 | return 0; |
| 203 | } | |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
204 | if (newcap > buffer->max_capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
205 | return -1; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
206 | } |
| 1515 | 207 | const int force_copy_flags = CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_COPY_ON_EXTEND; |
| 208 | if (buffer->flags & force_copy_flags) { | |
| 209 | void *newspace = cxMalloc(buffer->allocator, newcap); | |
| 210 | if (NULL == newspace) return -1; | |
| 211 | memcpy(newspace, buffer->space, buffer->size); | |
| 212 | buffer->space = newspace; | |
| 213 | buffer->capacity = newcap; | |
| 214 | buffer->flags &= ~force_copy_flags; | |
| 215 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; | |
| 216 | return 0; | |
| 217 | } else if (cxReallocate(buffer->allocator, | |
| 218 | (void **) &buffer->bytes, newcap) == 0) { | |
|
1542
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
219 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; |
| 1515 | 220 | buffer->capacity = newcap; |
|
1542
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
221 | if (buffer->size > newcap) { |
|
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
222 | buffer->size = newcap; |
|
197450c2b0b3
change cxBufferReserve() to allow reducing the capacity
Mike Becker <universe@uap-core.de>
parents:
1539
diff
changeset
|
223 | } |
| 1515 | 224 | return 0; |
| 225 | } else { | |
| 226 | return -1; // LCOV_EXCL_LINE | |
| 227 | } | |
| 228 | } | |
| 229 | ||
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
230 | int cxBufferMaximumCapacity(CxBuffer *buffer, size_t capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
231 | if (capacity < buffer->capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
232 | return -1; |
|
1516
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
233 | } |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
234 | buffer->max_capacity = capacity; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
235 | return 0; |
|
1516
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
236 | } |
|
95b094472e9a
fixes that cxBufferWrite() could auto-extend the buffer beyond the configured threshold
Mike Becker <universe@uap-core.de>
parents:
1515
diff
changeset
|
237 | |
| 1515 | 238 | 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
|
239 | if (newcap <= buffer->capacity) { |
|
080c304ec176
fix cxBufferMinimumCapacity implementation still using additional_bytes
Mike Becker <universe@uap-core.de>
parents:
530
diff
changeset
|
240 | return 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
241 | } |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
242 | if (newcap > buffer->max_capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
243 | return -1; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
244 | } |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
245 | if (newcap < buffer->max_capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
246 | unsigned long pagesize = cx_system_page_size(); |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
247 | // if page size is larger than 64 KB - for some reason - truncate to 64 KB |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
248 | if (pagesize > 65536) pagesize = 65536; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
249 | if (newcap < pagesize) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
250 | // when smaller as one page, map to the next power of two |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
251 | newcap--; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
252 | newcap |= newcap >> 1; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
253 | newcap |= newcap >> 2; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
254 | newcap |= newcap >> 4; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
255 | // last operation only needed for pages larger 4096 bytes |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
256 | // but if/else would be more expensive than just doing this |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
257 | newcap |= newcap >> 8; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
258 | newcap++; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
259 | } else { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
260 | // otherwise, map to a multiple of the page size |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
261 | newcap -= newcap % pagesize; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
262 | newcap += pagesize; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
263 | // note: if newcap is already page aligned, |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
264 | // this gives a full additional page (which is good) |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
265 | } |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
266 | if (newcap > buffer->max_capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
267 | newcap = buffer->max_capacity; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
268 | } |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
269 | } |
| 1515 | 270 | return cxBufferReserve(buffer, newcap); |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
271 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
272 | |
|
1290
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
273 | void cxBufferShrink( |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
274 | CxBuffer *buffer, |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
275 | size_t reserve |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
276 | ) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
277 | // Ensure buffer is in a reallocatable state |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
278 | 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
|
279 | if (buffer->flags & force_copy_flags) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
280 | // do nothing when we are not allowed to reallocate |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
281 | return; |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
282 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
283 | |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
284 | // calculate new capacity |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
285 | size_t newCapacity = buffer->size + reserve; |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
286 | |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
287 | // 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
|
288 | if (newCapacity < buffer->capacity) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
289 | if (0 == cxReallocate(buffer->allocator, &buffer->bytes, newCapacity)) { |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
290 | buffer->capacity = newCapacity; |
|
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 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
293 | } |
|
4ac889e14211
adds cxBufferShrink() - resolves #626
Mike Becker <universe@uap-core.de>
parents:
1288
diff
changeset
|
294 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
295 | size_t cxBufferWrite( |
|
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
761
diff
changeset
|
296 | const void *ptr, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
297 | size_t size, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
298 | size_t nitems, |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
299 | CxBuffer *buffer |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
300 | ) { |
|
543
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
301 | // optimize for easy case |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
302 | 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
|
303 | 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
|
304 | memcpy(buffer->bytes + buffer->pos, ptr, nitems); |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
305 | buffer->pos += nitems; |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
306 | if (buffer->pos > buffer->size) { |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
307 | buffer->size = buffer->pos; |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
308 | } |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
309 | return nitems; |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
310 | } |
|
7b9114030ca4
optimization for buffer write easy cases
Mike Becker <universe@uap-core.de>
parents:
542
diff
changeset
|
311 | |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
312 | size_t len; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
313 | 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
|
314 | errno = EOVERFLOW; |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
315 | return 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
316 | } |
| 1110 | 317 | if (buffer->pos > SIZE_MAX - len) { |
| 318 | errno = EOVERFLOW; | |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
319 | return 0; |
| 1110 | 320 | } |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
321 | const size_t required = buffer->pos + len; |
|
1138
29672c777a28
avoid recursion in cxBufferWrite() - fixes #567
Mike Becker <universe@uap-core.de>
parents:
1135
diff
changeset
|
322 | |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
323 | // check if we need to auto-extend |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
324 | 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
|
325 | if (buffer->flags & CX_BUFFER_AUTO_EXTEND) { |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
326 | size_t newcap = required < buffer->max_capacity |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
327 | ? required : buffer->max_capacity; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
328 | if (cxBufferMinimumCapacity(buffer, newcap)) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
329 | return 0; // LCOV_EXCL_LINE |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
330 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
331 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
332 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
333 | |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
334 | // check again and truncate data if capacity is still not enough |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
335 | if (required > buffer->capacity) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
336 | len = buffer->capacity - buffer->pos; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
337 | if (size > 1) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
338 | len -= len % size; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
339 | } |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
340 | nitems = len / size; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
341 | } |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
342 | |
| 1110 | 343 | // 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
|
344 | if (len == 0) { |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
345 | return 0; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
346 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
347 | |
| 1110 | 348 | // check if we need to copy |
| 349 | 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
|
350 | |
| 1110 | 351 | // perform the operation |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
352 | memcpy(buffer->bytes + buffer->pos, ptr, len); |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
353 | buffer->pos += len; |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
354 | if (buffer->pos > buffer->size) { |
|
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
355 | buffer->size = buffer->pos; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
356 | } |
|
1571
25ead2ffb9b5
removes buffer flush and adds maximum capacity instead - resolves #185
Mike Becker <universe@uap-core.de>
parents:
1542
diff
changeset
|
357 | return nitems; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
358 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
359 | |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
360 | size_t cxBufferAppend( |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
361 | const void *ptr, |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
362 | size_t size, |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
363 | size_t nitems, |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
364 | CxBuffer *buffer |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
365 | ) { |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
366 | size_t pos = buffer->pos; |
|
1131
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
367 | size_t append_pos = buffer->size; |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
368 | buffer->pos = append_pos; |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
369 | 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
|
370 | // the buffer might have been flushed |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
371 | // 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
|
372 | // expected: pos = append_pos + written |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
373 | // -> 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
|
374 | 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
|
375 | if (delta > pos) { |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
376 | buffer->pos = 0; |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
377 | } else { |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
378 | buffer->pos = pos - delta; |
|
644f77f903b1
fix cxBufferAppend() not adjusting position after flush
Mike Becker <universe@uap-core.de>
parents:
1128
diff
changeset
|
379 | } |
|
1030
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
380 | return written; |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
381 | } |
|
06091e067bee
add cxBufferAppend() - fixes #534
Mike Becker <universe@uap-core.de>
parents:
1028
diff
changeset
|
382 | |
|
538
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
383 | int cxBufferPut( |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
384 | CxBuffer *buffer, |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
385 | int c |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
386 | ) { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
387 | c &= 0xFF; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
388 | unsigned char const ch = c; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
389 | if (cxBufferWrite(&ch, 1, 1, buffer) == 1) { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
390 | return c; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
391 | } else { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
392 | return EOF; |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
393 | } |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
394 | } |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
395 | |
|
1005
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
396 | int cxBufferTerminate(CxBuffer *buffer) { |
|
1284
b2103354baed
fix implementation of cxBufferTerminate() - fixes #631
Mike Becker <universe@uap-core.de>
parents:
1259
diff
changeset
|
397 | if (0 == cxBufferPut(buffer, 0)) { |
|
b2103354baed
fix implementation of cxBufferTerminate() - fixes #631
Mike Becker <universe@uap-core.de>
parents:
1259
diff
changeset
|
398 | buffer->size = buffer->pos - 1; |
|
1005
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
399 | return 0; |
|
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
400 | } else { |
|
1018
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
401 | return -1; |
|
1005
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
402 | } |
|
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
403 | } |
|
67fa386ce600
add cxBufferTerminate()
Mike Becker <universe@uap-core.de>
parents:
1004
diff
changeset
|
404 | |
|
538
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
405 | size_t cxBufferPutString( |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
406 | CxBuffer *buffer, |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
407 | const char *str |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
408 | ) { |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
409 | return cxBufferWrite(str, 1, strlen(str), buffer); |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
410 | } |
|
2cfbcbe86a7c
#170 first basic write tests
Mike Becker <universe@uap-core.de>
parents:
536
diff
changeset
|
411 | |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
412 | size_t cxBufferRead( |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
413 | void *ptr, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
414 | size_t size, |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
415 | size_t nitems, |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
416 | CxBuffer *buffer |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
417 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
418 | size_t len; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
419 | 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
|
420 | errno = EOVERFLOW; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
421 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
422 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
423 | if (buffer->pos + len > buffer->size) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
424 | len = buffer->size - buffer->pos; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
425 | if (size > 1) len -= len % size; |
|
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 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
428 | if (len <= 0) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
429 | return len; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
430 | } |
|
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 | memcpy(ptr, buffer->bytes + buffer->pos, len); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
433 | buffer->pos += len; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
434 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
435 | return len / size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
436 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
437 | |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
438 | int cxBufferGet(CxBuffer *buffer) { |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
439 | if (cxBufferEof(buffer)) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
440 | return EOF; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
441 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
442 | int c = buffer->bytes[buffer->pos]; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
443 | buffer->pos++; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
444 | return c; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
445 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
446 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
447 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
448 | int cxBufferShiftLeft( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
449 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
450 | size_t shift |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
451 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
452 | if (shift >= buffer->size) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
453 | buffer->pos = buffer->size = 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
454 | } else { |
|
1028
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
Mike Becker <universe@uap-core.de>
parents:
1018
diff
changeset
|
455 | if (buffer_copy_on_write(buffer)) return -1; |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
456 | memmove(buffer->bytes, buffer->bytes + shift, buffer->size - shift); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
457 | buffer->size -= shift; |
|
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 | if (buffer->pos >= shift) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
460 | buffer->pos -= shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
461 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
462 | buffer->pos = 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
463 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
464 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
465 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
466 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
467 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
468 | int cxBufferShiftRight( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
469 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
470 | size_t shift |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
471 | ) { |
|
1040
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents:
1030
diff
changeset
|
472 | 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
|
473 | 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
|
474 | 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
|
475 | } |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
476 | size_t req_capacity = buffer->size + shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
477 | size_t movebytes; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
478 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
479 | // auto extend buffer, if required and enabled |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
480 | 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
|
481 | if (buffer->flags & CX_BUFFER_AUTO_EXTEND) { |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
482 | if (cxBufferMinimumCapacity(buffer, req_capacity)) { |
|
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
483 | return -1; // LCOV_EXCL_LINE |
|
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 | movebytes = buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
486 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
487 | movebytes = buffer->capacity - shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
488 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
489 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
490 | movebytes = buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
491 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
492 | |
|
1018
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
493 | 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
|
494 | 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
|
495 | 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
|
496 | 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
|
497 | } |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
498 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
499 | buffer->pos += shift; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
500 | if (buffer->pos > buffer->size) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
501 | buffer->pos = buffer->size; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
502 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
503 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
504 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
505 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
506 | |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
507 | int cxBufferShift( |
|
500
eb9e7bd40a8e
do not hide pointers behind typedefs
Mike Becker <universe@uap-core.de>
parents:
489
diff
changeset
|
508 | CxBuffer *buffer, |
|
483
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
509 | off_t shift |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
510 | ) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
511 | if (shift < 0) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
512 | return cxBufferShiftLeft(buffer, (size_t) (-shift)); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
513 | } else if (shift > 0) { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
514 | return cxBufferShiftRight(buffer, (size_t) shift); |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
515 | } else { |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
516 | return 0; |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
517 | } |
|
929016224c3c
add ported UCX buffer implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
518 | } |