projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
liblttng-ctl: use export list to define exported symbols
[lttng-tools.git]
/
src
/
common
/
compat
/
poll.c
diff --git
a/src/common/compat/poll.c
b/src/common/compat/poll.c
index c5dd494b8920317140eb44afbd9f37e52b936e24..9da2470d08767e4d83bc2e9a3ff0a9fc9faf38d4 100644
(file)
--- a/
src/common/compat/poll.c
+++ b/
src/common/compat/poll.c
@@
-7,7
+7,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdbool.h>
@@
-48,7
+47,7
@@
static int resize_poll_event(struct lttng_poll_event *events,
{
struct epoll_event *ptr;
{
struct epoll_event *ptr;
-
assert
(events);
+
LTTNG_ASSERT
(events);
ptr = realloc(events->events, new_size * sizeof(*ptr));
if (ptr == NULL) {
ptr = realloc(events->events, new_size * sizeof(*ptr));
if (ptr == NULL) {
@@
-72,7
+71,6
@@
error:
/*
* Create epoll set and allocate returned events structure.
*/
/*
* Create epoll set and allocate returned events structure.
*/
-LTTNG_HIDDEN
int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
{
int ret;
int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
{
int ret;
@@
-125,7
+123,6
@@
error:
/*
* Add a fd to the epoll set with requesting events.
*/
/*
* Add a fd to the epoll set with requesting events.
*/
-LTTNG_HIDDEN
int compat_epoll_add(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
int compat_epoll_add(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
@@
-173,7
+170,6
@@
error:
/*
* Remove a fd from the epoll set.
*/
/*
* Remove a fd from the epoll set.
*/
-LTTNG_HIDDEN
int compat_epoll_del(struct lttng_poll_event *events, int fd)
{
int ret;
int compat_epoll_del(struct lttng_poll_event *events, int fd)
{
int ret;
@@
-208,7
+204,6
@@
error:
/*
* Set an fd's events.
*/
/*
* Set an fd's events.
*/
-LTTNG_HIDDEN
int compat_epoll_mod(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
int compat_epoll_mod(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
@@
-250,7
+245,6
@@
error:
/*
* Wait on epoll set. This is a blocking call of timeout value.
*/
/*
* Wait on epoll set. This is a blocking call of timeout value.
*/
-LTTNG_HIDDEN
int compat_epoll_wait(struct lttng_poll_event *events, int timeout,
bool interruptible)
{
int compat_epoll_wait(struct lttng_poll_event *events, int timeout,
bool interruptible)
{
@@
-305,7
+299,6
@@
error:
/*
* Setup poll set maximum size.
*/
/*
* Setup poll set maximum size.
*/
-LTTNG_HIDDEN
int compat_epoll_set_max_size(void)
{
int ret, fd, retval = 0;
int compat_epoll_set_max_size(void)
{
int ret, fd, retval = 0;
@@
-374,7
+367,7
@@
static int resize_poll_event(struct compat_poll_event_array *array,
{
struct pollfd *ptr;
{
struct pollfd *ptr;
-
assert
(array);
+
LTTNG_ASSERT
(array);
/* Refuse to resize the array more than the max size. */
if (new_size > poll_max_size) {
/* Refuse to resize the array more than the max size. */
if (new_size > poll_max_size) {
@@
-408,7
+401,7
@@
static int update_current_events(struct lttng_poll_event *events)
int ret;
struct compat_poll_event_array *current, *wait;
int ret;
struct compat_poll_event_array *current, *wait;
-
assert
(events);
+
LTTNG_ASSERT
(events);
current = &events->current;
wait = &events->wait;
current = &events->current;
wait = &events->wait;
@@
-435,7
+428,6
@@
error:
/*
* Create pollfd data structure.
*/
/*
* Create pollfd data structure.
*/
-LTTNG_HIDDEN
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
@@
-488,7
+480,6
@@
error:
/*
* Add fd to pollfd data structure with requested events.
*/
/*
* Add fd to pollfd data structure with requested events.
*/
-LTTNG_HIDDEN
int compat_poll_add(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
int compat_poll_add(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
@@
-535,7
+526,6
@@
error:
/*
* Modify an fd's events..
*/
/*
* Modify an fd's events..
*/
-LTTNG_HIDDEN
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
@@
-572,7
+562,6
@@
error:
/*
* Remove a fd from the pollfd structure.
*/
/*
* Remove a fd from the pollfd structure.
*/
-LTTNG_HIDDEN
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int i, count = 0, ret;
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int i, count = 0, ret;
@@
-602,7
+591,7
@@
int compat_poll_del(struct lttng_poll_event *events, int fd)
}
/* No fd duplicate should be ever added into array. */
}
/* No fd duplicate should be ever added into array. */
-
assert
(current->nb_fd - 1 == count);
+
LTTNG_ASSERT
(current->nb_fd - 1 == count);
current->nb_fd = count;
/* Resize array if needed. */
current->nb_fd = count;
/* Resize array if needed. */
@@
-627,7
+616,6
@@
error:
/*
* Wait on poll() with timeout. Blocking call.
*/
/*
* Wait on poll() with timeout. Blocking call.
*/
-LTTNG_HIDDEN
int compat_poll_wait(struct lttng_poll_event *events, int timeout,
bool interruptible)
{
int compat_poll_wait(struct lttng_poll_event *events, int timeout,
bool interruptible)
{
@@
-707,7
+695,6
@@
error:
/*
* Setup poll set maximum size.
*/
/*
* Setup poll set maximum size.
*/
-LTTNG_HIDDEN
int compat_poll_set_max_size(void)
{
int ret, retval = 0;
int compat_poll_set_max_size(void)
{
int ret, retval = 0;
This page took
0.025924 seconds
and
4
git commands to generate.