projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: handle EINTR return value for bt_posix_fallocate
[babeltrace.git]
/
formats
/
ctf
/
writer
/
event-fields.c
diff --git
a/formats/ctf/writer/event-fields.c
b/formats/ctf/writer/event-fields.c
index ff970c0a86959fee1ce87ddcd2138dcb2b1b4c92..c49bc3fa6dc1bca5b325b1be872480c9e68a1487 100644
(file)
--- a/
formats/ctf/writer/event-fields.c
+++ b/
formats/ctf/writer/event-fields.c
@@
-30,6
+30,7
@@
#include <babeltrace/ctf-writer/event-fields-internal.h>
#include <babeltrace/ctf-writer/event-types-internal.h>
#include <babeltrace/compiler.h>
#include <babeltrace/ctf-writer/event-fields-internal.h>
#include <babeltrace/ctf-writer/event-types-internal.h>
#include <babeltrace/compiler.h>
+#include <babeltrace/compat/fcntl.h>
#define PACKET_LEN_INCREMENT (getpagesize() * 8 * CHAR_BIT)
#define PACKET_LEN_INCREMENT (getpagesize() * 8 * CHAR_BIT)
@@
-179,8
+180,8
@@
struct bt_ctf_field *bt_ctf_field_create(struct bt_ctf_field_type *type)
}
type_id = bt_ctf_field_type_get_type_id(type);
}
type_id = bt_ctf_field_type_get_type_id(type);
- if (type_id <= CTF_TYPE_UNKNOWN ||
-
type_id >= NR_CTF_TYPES
) {
+ if (type_id <= CTF_TYPE_UNKNOWN ||
type_id >= NR_CTF_TYPES ||
+
bt_ctf_field_type_validate(type)
) {
goto error;
}
goto error;
}
@@
-445,7
+446,7
@@
struct bt_ctf_field *bt_ctf_field_variant_get_field(struct bt_ctf_field *field,
tag_enum_integer = container_of(tag_enum, struct bt_ctf_field_integer,
parent);
tag_enum_integer = container_of(tag_enum, struct bt_ctf_field_integer,
parent);
- if (
!bt_ctf_field_validate(variant->tag)
) {
+ if (
bt_ctf_field_validate(tag_field) < 0
) {
goto end;
}
goto end;
}
@@
-941,7
+942,7
@@
void bt_ctf_field_string_destroy(struct bt_ctf_field *field)
static
int bt_ctf_field_generic_validate(struct bt_ctf_field *field)
{
static
int bt_ctf_field_generic_validate(struct bt_ctf_field *field)
{
- return
!(field && field->payload_set)
;
+ return
(field && field->payload_set) ? 0 : -1
;
}
static
}
static
@@
-1131,7
+1132,10
@@
int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
}
}
}
}
- ctf_align_pos(pos, field->type->declaration->alignment);
+ if (!ctf_align_pos(pos, field->type->declaration->alignment)) {
+ ret = -1;
+ goto end;
+ }
for (i = 0; i < structure->fields->len; i++) {
struct bt_ctf_field *field = g_ptr_array_index(
for (i = 0; i < structure->fields->len; i++) {
struct bt_ctf_field *field = g_ptr_array_index(
@@
-1238,9
+1242,13
@@
int increase_packet_size(struct ctf_stream_pos *pos)
}
pos->packet_size += PACKET_LEN_INCREMENT;
}
pos->packet_size += PACKET_LEN_INCREMENT;
- ret = posix_fallocate(pos->fd, pos->mmap_offset,
- pos->packet_size / CHAR_BIT);
+ do {
+ ret = bt_posix_fallocate(pos->fd, pos->mmap_offset,
+ pos->packet_size / CHAR_BIT);
+ } while (ret == EINTR);
if (ret) {
if (ret) {
+ errno = EINTR;
+ ret = -1;
goto end;
}
goto end;
}
This page took
0.024812 seconds
and
4
git commands to generate.