projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: standardise include path
[lttng-ust.git]
/
liblttng-ust-ctl
/
ustctl.c
diff --git
a/liblttng-ust-ctl/ustctl.c
b/liblttng-ust-ctl/ustctl.c
index ea5ab9dc4ed3ce29cd3dad50b1cc16c4bc32167a..a6fb6d83380c5bb23fc0788c5249b913163a8ea0 100644
(file)
--- a/
liblttng-ust-ctl/ustctl.c
+++ b/
liblttng-ust-ctl/ustctl.c
@@
-16,8
+16,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
-#include <byteswap.h>
#include <stdint.h>
#include <string.h>
#include <sys/mman.h>
#include <stdint.h>
#include <string.h>
#include <sys/mman.h>
@@
-27,6
+25,7
@@
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-events.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-events.h>
+#include <lttng/ust-endian.h>
#include <usterr-signal-safe.h>
#include <ust-comm.h>
#include <helper.h>
#include <usterr-signal-safe.h>
#include <ust-comm.h>
#include <helper.h>
@@
-111,8
+110,10
@@
int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
ret = -errno;
return ret;
}
ret = -errno;
return ret;
}
+ data->u.channel.wakeup_fd = -1;
}
free(data->u.channel.data);
}
free(data->u.channel.data);
+ data->u.channel.data = NULL;
break;
case LTTNG_UST_OBJECT_TYPE_STREAM:
if (data->u.stream.shm_fd >= 0) {
break;
case LTTNG_UST_OBJECT_TYPE_STREAM:
if (data->u.stream.shm_fd >= 0) {
@@
-121,6
+122,7
@@
int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
ret = -errno;
return ret;
}
ret = -errno;
return ret;
}
+ data->u.stream.shm_fd = -1;
}
if (data->u.stream.wakeup_fd >= 0) {
ret = close(data->u.stream.wakeup_fd);
}
if (data->u.stream.wakeup_fd >= 0) {
ret = close(data->u.stream.wakeup_fd);
@@
-128,6
+130,7
@@
int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
ret = -errno;
return ret;
}
ret = -errno;
return ret;
}
+ data->u.stream.wakeup_fd = -1;
}
break;
case LTTNG_UST_OBJECT_TYPE_EVENT:
}
break;
case LTTNG_UST_OBJECT_TYPE_EVENT:
This page took
0.024518 seconds
and
4
git commands to generate.