projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: implicit declaration of function 'PERROR' on Solaris
[lttng-tools.git]
/
src
/
common
/
payload-view.c
diff --git
a/src/common/payload-view.c
b/src/common/payload-view.c
index 8c99c56efa5d9d122c8fb6571e887cf3c74469cd..4a4edea146385ae0e2198ebfbd5a41a32d7c1c04 100644
(file)
--- a/
src/common/payload-view.c
+++ b/
src/common/payload-view.c
@@
-19,7
+19,7
@@
struct lttng_payload_view lttng_payload_view_from_payload(
return (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_dynamic_buffer(
&payload->buffer, offset, len),
return (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_dynamic_buffer(
&payload->buffer, offset, len),
- ._fd
s = payload->_fd
s,
+ ._fd
_handles = payload->_fd_handle
s,
};
}
};
}
@@
-31,9
+31,9
@@
struct lttng_payload_view lttng_payload_view_from_view(
return (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_view(
&view->buffer, offset, len),
return (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_view(
&view->buffer, offset, len),
- ._fd
s = view->_fd
s,
- ._iterator.p_fd
s_position = view->_iterator.p_fd
s_position ?:
- &view->_iterator.fds_position,
+ ._fd
_handles = view->_fd_handle
s,
+ ._iterator.p_fd
_handles_position = view->_iterator.p_fd_handle
s_position ?:
+ &view->_iterator.fd
_handle
s_position,
};
}
};
}
@@
-70,7
+70,8
@@
struct lttng_payload_view lttng_payload_view_init_from_buffer(
}
LTTNG_HIDDEN
}
LTTNG_HIDDEN
-int lttng_payload_view_get_fd_count(struct lttng_payload_view *payload_view)
+int lttng_payload_view_get_fd_handle_count(
+ const struct lttng_payload_view *payload_view)
{
int ret;
size_t position;
{
int ret;
size_t position;
@@
-80,43
+81,43
@@
int lttng_payload_view_get_fd_count(struct lttng_payload_view *payload_view)
goto end;
}
goto end;
}
- ret = lttng_dynamic_
array_get_count(&payload_view->_fd
s);
+ ret = lttng_dynamic_
pointer_array_get_count(&payload_view->_fd_handle
s);
if (ret < 0) {
goto end;
}
if (ret < 0) {
goto end;
}
- position = payload_view->_iterator.p_fds_position ?
- *payload_view->_iterator.p_fds_position :
- payload_view->_iterator.fds_position;
+ position = payload_view->_iterator.p_fd
_handle
s_position ?
+ *payload_view->_iterator.p_fd
_handle
s_position :
+ payload_view->_iterator.fd
_handle
s_position;
ret = ret - (int) position;
end:
return ret;
}
LTTNG_HIDDEN
ret = ret - (int) position;
end:
return ret;
}
LTTNG_HIDDEN
-int lttng_payload_view_pop_fd(struct lttng_payload_view *view)
+struct fd_handle *lttng_payload_view_pop_fd_handle(
+ struct lttng_payload_view *view)
{
{
-
int ret = 0
;
- size_t fd_count;
+
struct fd_handle *handle = NULL
;
+ size_t fd_
handle_
count;
size_t *pos;
if (!view) {
size_t *pos;
if (!view) {
- ret = -1;
goto end;
}
goto end;
}
- fd_count = lttng_dynamic_array_get_count(&view->_fds);
- pos = view->_iterator.p_fds_position ? view->_iterator.p_fds_position :
- &view->_iterator.fds_position;
-
- if (*pos >= fd_count) {
- ret = -1;
+ fd_handle_count = lttng_payload_view_get_fd_handle_count(view);
+ if (fd_handle_count == 0) {
goto end;
}
goto end;
}
- ret = *((int *) lttng_dynamic_array_get_element(
- &view->_fds, *pos));
+ pos = view->_iterator.p_fd_handles_position ?
+ view->_iterator.p_fd_handles_position :
+ &view->_iterator.fd_handles_position;
+ handle = lttng_dynamic_pointer_array_get_pointer(&view->_fd_handles,
+ *pos);
(*pos)++;
(*pos)++;
+ fd_handle_get(handle);
end:
end:
- return
ret
;
+ return
handle
;
}
}
This page took
0.026032 seconds
and
5
git commands to generate.