projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: compile liblttng-ctl as C++
[lttng-tools.git]
/
src
/
common
/
dynamic-buffer.c
diff --git
a/src/common/dynamic-buffer.c
b/src/common/dynamic-buffer.c
index b6544e62ba5f3f646bd9bd1630a9ca5668b5f190..d6ad6740fc62434ffc09f06dfc8689f955111a23 100644
(file)
--- a/
src/common/dynamic-buffer.c
+++ b/
src/common/dynamic-buffer.c
@@
-8,7
+8,6
@@
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/utils.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/utils.h>
-#include <assert.h>
/*
* Round to (upper) power of two, val is returned if it already is a power of
/*
* Round to (upper) power of two, val is returned if it already is a power of
@@
-17,25
+16,22
@@
static
size_t round_to_power_of_2(size_t val)
{
static
size_t round_to_power_of_2(size_t val)
{
- int order;
size_t rounded;
size_t rounded;
+ const int order = utils_get_count_order_u64(val);
- order = utils_get_count_order_u64(val);
- assert(order >= 0);
+ LTTNG_ASSERT(order >= 0);
rounded = (1ULL << order);
rounded = (1ULL << order);
-
assert
(rounded >= val);
+
LTTNG_ASSERT
(rounded >= val);
return rounded;
}
return rounded;
}
-LTTNG_HIDDEN
void lttng_dynamic_buffer_init(struct lttng_dynamic_buffer *buffer)
{
void lttng_dynamic_buffer_init(struct lttng_dynamic_buffer *buffer)
{
-
assert
(buffer);
+
LTTNG_ASSERT
(buffer);
memset(buffer, 0, sizeof(*buffer));
}
memset(buffer, 0, sizeof(*buffer));
}
-LTTNG_HIDDEN
int lttng_dynamic_buffer_append(struct lttng_dynamic_buffer *buffer,
const void *buf, size_t len)
{
int lttng_dynamic_buffer_append(struct lttng_dynamic_buffer *buffer,
const void *buf, size_t len)
{
@@
-51,7
+47,7
@@
int lttng_dynamic_buffer_append(struct lttng_dynamic_buffer *buffer,
goto end;
}
goto end;
}
-
assert
(buffer->_capacity >= buffer->size);
+
LTTNG_ASSERT
(buffer->_capacity >= buffer->size);
if (buffer->_capacity < (len + buffer->size)) {
ret = lttng_dynamic_buffer_set_capacity(buffer,
buffer->_capacity +
if (buffer->_capacity < (len + buffer->size)) {
ret = lttng_dynamic_buffer_set_capacity(buffer,
buffer->_capacity +
@@
-67,7
+63,6
@@
end:
return ret;
}
return ret;
}
-LTTNG_HIDDEN
int lttng_dynamic_buffer_append_buffer(struct lttng_dynamic_buffer *dst_buffer,
const struct lttng_dynamic_buffer *src_buffer)
{
int lttng_dynamic_buffer_append_buffer(struct lttng_dynamic_buffer *dst_buffer,
const struct lttng_dynamic_buffer *src_buffer)
{
@@
-84,7
+79,6
@@
end:
return ret;
}
return ret;
}
-LTTNG_HIDDEN
int lttng_dynamic_buffer_append_view(struct lttng_dynamic_buffer *buffer,
const struct lttng_buffer_view *src)
{
int lttng_dynamic_buffer_append_view(struct lttng_dynamic_buffer *buffer,
const struct lttng_buffer_view *src)
{
@@
-101,7
+95,6
@@
end:
return ret;
}
return ret;
}
-LTTNG_HIDDEN
int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
size_t new_size)
{
int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
size_t new_size)
{
@@
-135,12
+128,12
@@
int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
* size _before_ making such calls.
*/
}
* size _before_ making such calls.
*/
}
+
buffer->size = new_size;
end:
return ret;
}
buffer->size = new_size;
end:
return ret;
}
-LTTNG_HIDDEN
int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
size_t demanded_capacity)
{
int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
size_t demanded_capacity)
{
@@
-168,6
+161,7
@@
int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+
buffer->data = new_buf;
buffer->_capacity = new_capacity;
end:
buffer->data = new_buf;
buffer->_capacity = new_capacity;
end:
@@
-175,23
+169,24
@@
end:
}
/* Release any memory used by the dynamic buffer. */
}
/* Release any memory used by the dynamic buffer. */
-LTTNG_HIDDEN
void lttng_dynamic_buffer_reset(struct lttng_dynamic_buffer *buffer)
{
if (!buffer) {
return;
}
void lttng_dynamic_buffer_reset(struct lttng_dynamic_buffer *buffer)
{
if (!buffer) {
return;
}
+
buffer->size = 0;
buffer->_capacity = 0;
free(buffer->data);
buffer->size = 0;
buffer->_capacity = 0;
free(buffer->data);
+ buffer->data = NULL;
}
}
-LTTNG_HIDDEN
size_t lttng_dynamic_buffer_get_capacity_left(
struct lttng_dynamic_buffer *buffer)
{
if (!buffer) {
return 0;
}
size_t lttng_dynamic_buffer_get_capacity_left(
struct lttng_dynamic_buffer *buffer)
{
if (!buffer) {
return 0;
}
+
return buffer->_capacity - buffer->size;
}
return buffer->_capacity - buffer->size;
}
This page took
0.025505 seconds
and
4
git commands to generate.