Sun, 29 Dec 2024 18:03:21 +0100
optimize cxJsonObjGet() part 1 - binary search
part 2 will be the index buffer to preserve the order
relates to #462
| 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: 
1030diff
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: 
1024diff
changeset | 35 | static int buffer_copy_on_write(CxBuffer* buffer) { | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
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: 
1024diff
changeset | 37 | void *newspace = cxMalloc(buffer->allocator, buffer->capacity); | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 38 | if (NULL == newspace) return -1; | 
| 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
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: 
1007diff
changeset | 40 | buffer->space = newspace; | 
| 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
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: 
1007diff
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: 
1007diff
changeset | 43 | return 0; | 
| 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 44 | } | 
| 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 45 | |
| 501 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 46 | int cxBufferInit( | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
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: 
761diff
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: 
985diff
changeset | 53 | if (allocator == NULL) { | 
| 
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 54 | allocator = cxDefaultAllocator; | 
| 
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 55 | } | 
| 1028 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
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: 
1024diff
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: 
1024diff
changeset | 58 | } | 
| 501 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 59 | buffer->allocator = allocator; | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 60 | buffer->flags = flags; | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 61 | if (!space) { | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 62 | buffer->bytes = cxMalloc(allocator, capacity); | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 63 | if (buffer->bytes == NULL) { | 
| 1065 
6eb7b54975ee
improve coverage metrics
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 64 | return -1; // LCOV_EXCL_LINE | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 65 | } | 
| 501 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 66 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 67 | } else { | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 68 | buffer->bytes = space; | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 69 | } | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 70 | buffer->capacity = capacity; | 
| 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 71 | buffer->size = 0; | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 72 | buffer->pos = 0; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 73 | |
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 74 | buffer->flush_func = NULL; | 
| 541 
67e078518935
#170 complete write tests for status quo
 Mike Becker <universe@uap-core.de> parents: 
540diff
changeset | 75 | buffer->flush_target = NULL; | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 76 | buffer->flush_blkmax = 0; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 77 | buffer->flush_blksize = 4096; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 78 | buffer->flush_threshold = SIZE_MAX; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 79 | |
| 501 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 80 | return 0; | 
| 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 | |
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 83 | void cxBufferDestroy(CxBuffer *buffer) { | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 84 | if (buffer->flags & CX_BUFFER_FREE_CONTENTS) { | 
| 501 
9a08f5e515cc
add allocator support to CxBuffer
 Mike Becker <universe@uap-core.de> parents: 
500diff
changeset | 85 | cxFree(buffer->allocator, buffer->bytes); | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 86 | } | 
| 1030 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 87 | memset(buffer, 0, sizeof(CxBuffer)); | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 88 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 89 | |
| 683 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 90 | CxBuffer *cxBufferCreate( | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 91 | void *space, | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 92 | size_t capacity, | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
761diff
changeset | 93 | const CxAllocator *allocator, | 
| 683 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 94 | int flags | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 95 | ) { | 
| 989 
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 96 | if (allocator == NULL) { | 
| 
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 97 | allocator = cxDefaultAllocator; | 
| 
8aa57a7fecc4
improve consistency for allocator arguments - fixes #485
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 98 | } | 
| 683 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 99 | CxBuffer *buf = cxMalloc(allocator, sizeof(CxBuffer)); | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 100 | if (buf == NULL) return NULL; | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 101 | 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: 
673diff
changeset | 102 | return buf; | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 103 | } else { | 
| 1065 
6eb7b54975ee
improve coverage metrics
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 104 | // LCOV_EXCL_START | 
| 683 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 105 | cxFree(allocator, buf); | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 106 | return NULL; | 
| 1065 
6eb7b54975ee
improve coverage metrics
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 107 | // LCOV_EXCL_STOP | 
| 683 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 108 | } | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 109 | } | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 110 | |
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 111 | void cxBufferFree(CxBuffer *buffer) { | 
| 985 
68754c7de906
major refactoring of attributes
 Mike Becker <universe@uap-core.de> parents: 
970diff
changeset | 112 | if (buffer == NULL) return; | 
| 1030 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 113 | const CxAllocator *allocator = buffer->allocator; | 
| 991 
ec49db06dae0
cxBufferFree() now calls cxBufferDestroy()
 Mike Becker <universe@uap-core.de> parents: 
989diff
changeset | 114 | cxBufferDestroy(buffer); | 
| 1030 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 115 | cxFree(allocator, buffer); | 
| 683 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 116 | } | 
| 
aa0d09f2d81c
add convenience functions for allocating a buffer on the heap
 Mike Becker <universe@uap-core.de> parents: 
673diff
changeset | 117 | |
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 118 | int cxBufferSeek( | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 119 | CxBuffer *buffer, | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 120 | off_t offset, | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 121 | int whence | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 122 | ) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 123 | size_t npos; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 124 | switch (whence) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 125 | case SEEK_CUR: | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 126 | npos = buffer->pos; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 127 | break; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 128 | case SEEK_END: | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 129 | npos = buffer->size; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 130 | break; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 131 | case SEEK_SET: | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 132 | npos = 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 133 | break; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 134 | default: | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 135 | return -1; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 136 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 137 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 138 | size_t opos = npos; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 139 | npos += offset; | 
| 
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 | if ((offset > 0 && npos < opos) || (offset < 0 && npos > opos)) { | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1030diff
changeset | 142 | errno = EOVERFLOW; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 143 | return -1; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 144 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 145 | |
| 1007 
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
 Mike Becker <universe@uap-core.de> parents: 
1005diff
changeset | 146 | if (npos > buffer->size) { | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 147 | return -1; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 148 | } else { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 149 | buffer->pos = npos; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 150 | return 0; | 
| 
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 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 154 | |
| 529 
814d51173f20
#171 const qualifier and nonnull attributes
 Mike Becker <universe@uap-core.de> parents: 
501diff
changeset | 155 | void cxBufferClear(CxBuffer *buffer) { | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 156 | 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: 
1007diff
changeset | 157 | memset(buffer->bytes, 0, buffer->size); | 
| 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 158 | } | 
| 529 
814d51173f20
#171 const qualifier and nonnull attributes
 Mike Becker <universe@uap-core.de> parents: 
501diff
changeset | 159 | buffer->size = 0; | 
| 
814d51173f20
#171 const qualifier and nonnull attributes
 Mike Becker <universe@uap-core.de> parents: 
501diff
changeset | 160 | buffer->pos = 0; | 
| 
814d51173f20
#171 const qualifier and nonnull attributes
 Mike Becker <universe@uap-core.de> parents: 
501diff
changeset | 161 | } | 
| 
814d51173f20
#171 const qualifier and nonnull attributes
 Mike Becker <universe@uap-core.de> parents: 
501diff
changeset | 162 | |
| 761 
61d5197d612b
add cxBufferReset() - resolves #338
 Mike Becker <universe@uap-core.de> parents: 
683diff
changeset | 163 | void cxBufferReset(CxBuffer *buffer) { | 
| 
61d5197d612b
add cxBufferReset() - resolves #338
 Mike Becker <universe@uap-core.de> parents: 
683diff
changeset | 164 | buffer->size = 0; | 
| 
61d5197d612b
add cxBufferReset() - resolves #338
 Mike Becker <universe@uap-core.de> parents: 
683diff
changeset | 165 | buffer->pos = 0; | 
| 
61d5197d612b
add cxBufferReset() - resolves #338
 Mike Becker <universe@uap-core.de> parents: 
683diff
changeset | 166 | } | 
| 
61d5197d612b
add cxBufferReset() - resolves #338
 Mike Becker <universe@uap-core.de> parents: 
683diff
changeset | 167 | |
| 1004 
d8044fd5005c
make cxBufferEof() return a bool
 Mike Becker <universe@uap-core.de> parents: 
991diff
changeset | 168 | bool cxBufferEof(const CxBuffer *buffer) { | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 169 | return buffer->pos >= buffer->size; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 170 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 171 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 172 | int cxBufferMinimumCapacity( | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 173 | CxBuffer *buffer, | 
| 532 
080c304ec176
fix cxBufferMinimumCapacity implementation still using additional_bytes
 Mike Becker <universe@uap-core.de> parents: 
530diff
changeset | 174 | size_t newcap | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 175 | ) { | 
| 532 
080c304ec176
fix cxBufferMinimumCapacity implementation still using additional_bytes
 Mike Becker <universe@uap-core.de> parents: 
530diff
changeset | 176 | if (newcap <= buffer->capacity) { | 
| 
080c304ec176
fix cxBufferMinimumCapacity implementation still using additional_bytes
 Mike Becker <universe@uap-core.de> parents: 
530diff
changeset | 177 | return 0; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 178 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 179 | |
| 1028 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 180 | const int force_copy_flags = CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_COPY_ON_EXTEND; | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 181 | if (buffer->flags & force_copy_flags) { | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 182 | void *newspace = cxMalloc(buffer->allocator, newcap); | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 183 | if (NULL == newspace) return -1; | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 184 | memcpy(newspace, buffer->space, buffer->size); | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 185 | buffer->space = newspace; | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 186 | buffer->capacity = newcap; | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 187 | buffer->flags &= ~force_copy_flags; | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 188 | buffer->flags |= CX_BUFFER_FREE_CONTENTS; | 
| 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 189 | return 0; | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 190 | } else if (cxReallocate(buffer->allocator, | 
| 536 
cb9b9739055e
#170 add cxBufferClear test
 Mike Becker <universe@uap-core.de> parents: 
534diff
changeset | 191 | (void **) &buffer->bytes, newcap) == 0) { | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 192 | buffer->capacity = newcap; | 
| 533 
8d70ad8da899
do not implicitly zero freshly allocated memory
 Mike Becker <universe@uap-core.de> parents: 
532diff
changeset | 193 | return 0; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 194 | } else { | 
| 1065 
6eb7b54975ee
improve coverage metrics
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 195 | return -1; // LCOV_EXCL_LINE | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 196 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 197 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 198 | |
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 199 | /** | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 200 | * Helps flushing data to the flush target of a buffer. | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 201 | * | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 202 | * @param buffer the buffer containing the config | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 203 | * @param space the data to flush | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 204 | * @param size the element size | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 205 | * @param nitems the number of items | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 206 | * @return the number of items flushed | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 207 | */ | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 208 | static size_t cx_buffer_write_flush_helper( | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 209 | CxBuffer *buffer, | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
761diff
changeset | 210 | const unsigned char *space, | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 211 | size_t size, | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 212 | size_t nitems | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 213 | ) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 214 | size_t pos = 0; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 215 | size_t remaining = nitems; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 216 | size_t max_items = buffer->flush_blksize / size; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 217 | while (remaining > 0) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 218 | size_t items = remaining > max_items ? max_items : remaining; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 219 | size_t flushed = buffer->flush_func( | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 220 | space + pos, | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 221 | size, items, | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 222 | buffer->flush_target); | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 223 | if (flushed > 0) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 224 | pos += (flushed * size); | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 225 | remaining -= flushed; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 226 | } else { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 227 | // 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: 
543diff
changeset | 228 | break; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 229 | } | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 230 | } | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 231 | return nitems - remaining; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 232 | } | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 233 | |
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 234 | size_t cxBufferWrite( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
761diff
changeset | 235 | const void *ptr, | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 236 | size_t size, | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 237 | size_t nitems, | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 238 | CxBuffer *buffer | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 239 | ) { | 
| 543 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 240 | // optimize for easy case | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 241 | 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: 
1024diff
changeset | 242 | if (buffer_copy_on_write(buffer)) return 0; | 
| 543 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 243 | memcpy(buffer->bytes + buffer->pos, ptr, nitems); | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 244 | buffer->pos += nitems; | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 245 | if (buffer->pos > buffer->size) { | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 246 | buffer->size = buffer->pos; | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 247 | } | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 248 | return nitems; | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 249 | } | 
| 
7b9114030ca4
optimization for buffer write easy cases
 Mike Becker <universe@uap-core.de> parents: 
542diff
changeset | 250 | |
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 251 | size_t len; | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 252 | size_t nitems_out = nitems; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 253 | 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: 
1030diff
changeset | 254 | errno = EOVERFLOW; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 255 | return 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 256 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 257 | size_t required = buffer->pos + len; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 258 | if (buffer->pos > required) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 259 | return 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 260 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 261 | |
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 262 | bool perform_flush = false; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 263 | if (required > buffer->capacity) { | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 264 | if (buffer->flags & CX_BUFFER_AUTO_EXTEND) { | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 265 | if (buffer->flush_blkmax > 0 && required > buffer->flush_threshold) { | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 266 | perform_flush = true; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 267 | } else { | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 268 | if (cxBufferMinimumCapacity(buffer, required)) { | 
| 1065 
6eb7b54975ee
improve coverage metrics
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 269 | return 0; // LCOV_EXCL_LINE | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 270 | } | 
| 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 | } else { | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 273 | if (buffer->flush_blkmax > 0) { | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 274 | perform_flush = true; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 275 | } else { | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 276 | // truncate data to be written, if we can neither extend nor flush | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 277 | len = buffer->capacity - buffer->pos; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 278 | if (size > 1) { | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 279 | len -= len % size; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 280 | } | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 281 | nitems_out = len / size; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 282 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 283 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 284 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 285 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 286 | if (len == 0) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 287 | return len; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 288 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 289 | |
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 290 | if (perform_flush) { | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 291 | size_t flush_max; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 292 | if (cx_szmul(buffer->flush_blkmax, buffer->flush_blksize, &flush_max)) { | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1030diff
changeset | 293 | errno = EOVERFLOW; | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 294 | return 0; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 295 | } | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 296 | size_t flush_pos = buffer->flush_func == NULL || buffer->flush_target == NULL | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 297 | ? buffer->pos | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 298 | : cx_buffer_write_flush_helper(buffer, buffer->bytes, 1, buffer->pos); | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 299 | if (flush_pos == buffer->pos) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 300 | // entire buffer has been flushed, we can reset | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 301 | buffer->size = buffer->pos = 0; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 302 | |
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 303 | size_t items_flush; // how many items can also be directly flushed | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 304 | size_t items_keep; // how many items have to be written to the buffer | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 305 | |
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 306 | items_flush = flush_max >= required ? nitems : (flush_max - flush_pos) / size; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 307 | if (items_flush > 0) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 308 | items_flush = cx_buffer_write_flush_helper(buffer, ptr, size, items_flush / size); | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 309 | // in case we could not flush everything, keep the rest | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 310 | } | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 311 | items_keep = nitems - items_flush; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 312 | if (items_keep > 0) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 313 | // try again with the remaining stuff | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
761diff
changeset | 314 | const unsigned char *new_ptr = ptr; | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 315 | new_ptr += items_flush * size; | 
| 567 
f90a7cfe2480
#184 #170 more thorough flush testing
 Mike Becker <universe@uap-core.de> parents: 
544diff
changeset | 316 | // report the directly flushed items as written plus the remaining stuff | 
| 
f90a7cfe2480
#184 #170 more thorough flush testing
 Mike Becker <universe@uap-core.de> parents: 
544diff
changeset | 317 | return items_flush + cxBufferWrite(new_ptr, size, items_keep, buffer); | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 318 | } else { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 319 | // all items have been flushed - report them as written | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 320 | return nitems; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 321 | } | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 322 | } else if (flush_pos == 0) { | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 323 | // nothing could be flushed at all, we immediately give up without writing any data | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 324 | return 0; | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 325 | } else { | 
| 567 
f90a7cfe2480
#184 #170 more thorough flush testing
 Mike Becker <universe@uap-core.de> parents: 
544diff
changeset | 326 | // we were partially successful, we shift left and try again | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 327 | cxBufferShiftLeft(buffer, flush_pos); | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 328 | return cxBufferWrite(ptr, size, nitems, buffer); | 
| 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 329 | } | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 330 | } else { | 
| 1028 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 331 | if (buffer_copy_on_write(buffer)) return 0; | 
| 539 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 332 | memcpy(buffer->bytes + buffer->pos, ptr, len); | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 333 | buffer->pos += len; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 334 | if (buffer->pos > buffer->size) { | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 335 | buffer->size = buffer->pos; | 
| 
9cd98da9ee17
#184 start implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
538diff
changeset | 336 | } | 
| 544 
2e73456e5f84
#184 untested implementation of the flush feature
 Mike Becker <universe@uap-core.de> parents: 
543diff
changeset | 337 | return nitems_out; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 338 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 339 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 340 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 341 | |
| 1030 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 342 | size_t cxBufferAppend( | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 343 | const void *ptr, | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 344 | size_t size, | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 345 | size_t nitems, | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 346 | CxBuffer *buffer | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 347 | ) { | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 348 | size_t pos = buffer->pos; | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 349 | buffer->pos = buffer->size; | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 350 | size_t written = cxBufferWrite(ptr, size, nitems, buffer); | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 351 | buffer->pos = pos; | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 352 | return written; | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 353 | } | 
| 
06091e067bee
add cxBufferAppend() - fixes #534
 Mike Becker <universe@uap-core.de> parents: 
1028diff
changeset | 354 | |
| 538 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 355 | int cxBufferPut( | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 356 | CxBuffer *buffer, | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 357 | int c | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 358 | ) { | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 359 | c &= 0xFF; | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 360 | unsigned char const ch = c; | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 361 | if (cxBufferWrite(&ch, 1, 1, buffer) == 1) { | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 362 | return c; | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 363 | } else { | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 364 | return EOF; | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 365 | } | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 366 | } | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 367 | |
| 1005 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 368 | int cxBufferTerminate(CxBuffer *buffer) { | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 369 | bool success = 0 == cxBufferPut(buffer, 0); | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 370 | if (success) { | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 371 | buffer->pos--; | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 372 | buffer->size--; | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 373 | return 0; | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 374 | } else { | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 375 | return -1; | 
| 1005 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 376 | } | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 377 | } | 
| 
67fa386ce600
add cxBufferTerminate()
 Mike Becker <universe@uap-core.de> parents: 
1004diff
changeset | 378 | |
| 538 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 379 | size_t cxBufferPutString( | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 380 | CxBuffer *buffer, | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 381 | const char *str | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 382 | ) { | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 383 | return cxBufferWrite(str, 1, strlen(str), buffer); | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 384 | } | 
| 
2cfbcbe86a7c
#170 first basic write tests
 Mike Becker <universe@uap-core.de> parents: 
536diff
changeset | 385 | |
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 386 | size_t cxBufferRead( | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 387 | void *ptr, | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 388 | size_t size, | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 389 | size_t nitems, | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 390 | CxBuffer *buffer | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 391 | ) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 392 | size_t len; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 393 | 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: 
1030diff
changeset | 394 | errno = EOVERFLOW; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 395 | return 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 396 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 397 | if (buffer->pos + len > buffer->size) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 398 | len = buffer->size - buffer->pos; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 399 | if (size > 1) len -= len % size; | 
| 
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 | if (len <= 0) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 403 | return len; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 404 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 405 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 406 | memcpy(ptr, buffer->bytes + buffer->pos, len); | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 407 | buffer->pos += len; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 408 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 409 | return len / size; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 410 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 411 | |
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 412 | int cxBufferGet(CxBuffer *buffer) { | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 413 | if (cxBufferEof(buffer)) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 414 | return EOF; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 415 | } else { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 416 | int c = buffer->bytes[buffer->pos]; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 417 | buffer->pos++; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 418 | return c; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 419 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 420 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 421 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 422 | int cxBufferShiftLeft( | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 423 | CxBuffer *buffer, | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 424 | size_t shift | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 425 | ) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 426 | if (shift >= buffer->size) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 427 | buffer->pos = buffer->size = 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 428 | } else { | 
| 1028 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 429 | if (buffer_copy_on_write(buffer)) return -1; | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 430 | memmove(buffer->bytes, buffer->bytes + shift, buffer->size - shift); | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 431 | buffer->size -= shift; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 432 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 433 | if (buffer->pos >= shift) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 434 | buffer->pos -= shift; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 435 | } else { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 436 | buffer->pos = 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 437 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 438 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 439 | return 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 440 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 441 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 442 | int cxBufferShiftRight( | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 443 | CxBuffer *buffer, | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 444 | size_t shift | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 445 | ) { | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1030diff
changeset | 446 | 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: 
1030diff
changeset | 447 | errno = EOVERFLOW; | 
| 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1030diff
changeset | 448 | return -1; | 
| 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1030diff
changeset | 449 | } | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 450 | size_t req_capacity = buffer->size + shift; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 451 | size_t movebytes; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 452 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 453 | // auto extend buffer, if required and enabled | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 454 | if (buffer->capacity < req_capacity) { | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 455 | if (buffer->flags & CX_BUFFER_AUTO_EXTEND) { | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 456 | if (cxBufferMinimumCapacity(buffer, req_capacity)) { | 
| 1065 
6eb7b54975ee
improve coverage metrics
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 457 | return -1; // LCOV_EXCL_LINE | 
| 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 | movebytes = buffer->size; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 460 | } else { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 461 | movebytes = buffer->capacity - shift; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 462 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 463 | } else { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 464 | movebytes = buffer->size; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 465 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 466 | |
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 467 | if (movebytes > 0) { | 
| 1028 
3e4905241838
add copy-on-extend feature to UCX buffer - fixes #533
 Mike Becker <universe@uap-core.de> parents: 
1024diff
changeset | 468 | if (buffer_copy_on_write(buffer)) return -1; | 
| 1024 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 469 | 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: 
1007diff
changeset | 470 | buffer->size = shift + movebytes; | 
| 
8f99f6c28bd3
add copy-on-write feature to UCX buffer - fixes #531
 Mike Becker <universe@uap-core.de> parents: 
1007diff
changeset | 471 | } | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 472 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 473 | buffer->pos += shift; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 474 | if (buffer->pos > buffer->size) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 475 | buffer->pos = buffer->size; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 476 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 477 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 478 | return 0; | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 479 | } | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 480 | |
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 481 | int cxBufferShift( | 
| 500 
eb9e7bd40a8e
do not hide pointers behind typedefs
 Mike Becker <universe@uap-core.de> parents: 
489diff
changeset | 482 | CxBuffer *buffer, | 
| 483 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 483 | off_t shift | 
| 
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 | if (shift < 0) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 486 | return cxBufferShiftLeft(buffer, (size_t) (-shift)); | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 487 | } else if (shift > 0) { | 
| 
929016224c3c
add ported UCX buffer implementation
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 488 | return cxBufferShiftRight(buffer, (size_t) shift); | 
| 
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 | return 0; | 
| 
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 | } |