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
/
types
/
float.c
diff --git
a/formats/ctf/types/float.c
b/formats/ctf/types/float.c
index 2dfef86ee49dc4df4f017c39d8ce0be128602ddf..b82f68db91fbd901859ee3a8004ed6794c07b3a1 100644
(file)
--- a/
formats/ctf/types/float.c
+++ b/
formats/ctf/types/float.c
@@
-96,9
+96,9
@@
static void float_unlock(void)
assert(!ret);
}
assert(!ret);
}
-static int _ctf_float_copy(struct stream_pos *destp,
+static int _ctf_float_copy(struct
bt_
stream_pos *destp,
struct definition_float *dest_definition,
struct definition_float *dest_definition,
- struct stream_pos *srcp,
+ struct
bt_
stream_pos *srcp,
const struct definition_float *src_definition)
{
int ret;
const struct definition_float *src_definition)
{
int ret;
@@
-165,7
+165,7
@@
static int _ctf_float_copy(struct stream_pos *destp,
return 0;
}
return 0;
}
-int ctf_float_read(struct
stream_pos *ppos, struct
definition *definition)
+int ctf_float_read(struct
bt_stream_pos *ppos, struct bt_
definition *definition)
{
struct definition_float *float_definition =
container_of(definition, struct definition_float, p);
{
struct definition_float *float_definition =
container_of(definition, struct definition_float, p);
@@
-173,7
+173,7
@@
int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
float_definition->declaration;
struct ctf_stream_pos *pos = ctf_pos(ppos);
union doubleIEEE754 u;
float_definition->declaration;
struct ctf_stream_pos *pos = ctf_pos(ppos);
union doubleIEEE754 u;
- struct definition *tmpdef;
+ struct
bt_
definition *tmpdef;
struct definition_float *tmpfloat;
struct ctf_stream_pos destp;
struct mmap_align mma;
struct definition_float *tmpfloat;
struct ctf_stream_pos destp;
struct mmap_align mma;
@@
-197,11
+197,14
@@
int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
}
tmpfloat = container_of(tmpdef, struct definition_float, p);
memset(&destp, 0, sizeof(destp));
}
tmpfloat = container_of(tmpdef, struct definition_float, p);
memset(&destp, 0, sizeof(destp));
- ctf_init_pos(&destp, -1, O_RDWR);
+ ctf_init_pos(&destp,
NULL,
-1, O_RDWR);
mmap_align_set_addr(&mma, (char *) u.bits);
destp.base_mma = &mma;
mmap_align_set_addr(&mma, (char *) u.bits);
destp.base_mma = &mma;
- destp.packet_size = sizeof(u) * CHAR_BIT;
- ctf_align_pos(pos, float_declaration->p.alignment);
+ destp.content_size = destp.packet_size = sizeof(u) * CHAR_BIT;
+ if (!ctf_align_pos(pos, float_declaration->p.alignment)) {
+ ret = -EFAULT;
+ goto end_unref;
+ }
ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition);
switch (float_declaration->mantissa->len + 1) {
case FLT_MANT_DIG:
ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition);
switch (float_declaration->mantissa->len + 1) {
case FLT_MANT_DIG:
@@
-222,7
+225,7
@@
end:
return ret;
}
return ret;
}
-int ctf_float_write(struct
stream_pos *ppos, struct
definition *definition)
+int ctf_float_write(struct
bt_stream_pos *ppos, struct bt_
definition *definition)
{
struct definition_float *float_definition =
container_of(definition, struct definition_float, p);
{
struct definition_float *float_definition =
container_of(definition, struct definition_float, p);
@@
-230,9
+233,9
@@
int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
float_definition->declaration;
struct ctf_stream_pos *pos = ctf_pos(ppos);
union doubleIEEE754 u;
float_definition->declaration;
struct ctf_stream_pos *pos = ctf_pos(ppos);
union doubleIEEE754 u;
- struct definition *tmpdef;
+ struct
bt_
definition *tmpdef;
struct definition_float *tmpfloat;
struct definition_float *tmpfloat;
- struct ctf_stream_pos srcp;
+ struct ctf_stream_pos srcp
= { { 0 } }
;
struct mmap_align mma;
int ret;
struct mmap_align mma;
int ret;
@@
-253,10
+256,10
@@
int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
goto end;
}
tmpfloat = container_of(tmpdef, struct definition_float, p);
goto end;
}
tmpfloat = container_of(tmpdef, struct definition_float, p);
- ctf_init_pos(&srcp, -1, O_RDONLY);
+ ctf_init_pos(&srcp,
NULL,
-1, O_RDONLY);
mmap_align_set_addr(&mma, (char *) u.bits);
srcp.base_mma = &mma;
mmap_align_set_addr(&mma, (char *) u.bits);
srcp.base_mma = &mma;
- srcp.packet_size = sizeof(u) * CHAR_BIT;
+ srcp.
content_size = srcp.
packet_size = sizeof(u) * CHAR_BIT;
switch (float_declaration->mantissa->len + 1) {
case FLT_MANT_DIG:
u.vf = float_definition->value;
switch (float_declaration->mantissa->len + 1) {
case FLT_MANT_DIG:
u.vf = float_definition->value;
@@
-268,7
+271,10
@@
int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
ret = -EINVAL;
goto end_unref;
}
ret = -EINVAL;
goto end_unref;
}
- ctf_align_pos(pos, float_declaration->p.alignment);
+ if (!ctf_align_pos(pos, float_declaration->p.alignment)) {
+ ret = -EFAULT;
+ goto end_unref;
+ }
ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat);
end_unref:
ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat);
end_unref:
@@
-278,6
+284,14
@@
end:
return ret;
}
return ret;
}
+double bt_get_float(const struct bt_definition *field)
+{
+ struct definition_float *definition =
+ container_of(field, struct definition_float, p);
+
+ return definition->value;
+}
+
static
void __attribute__((constructor)) ctf_float_init(void)
{
static
void __attribute__((constructor)) ctf_float_init(void)
{
This page took
0.024438 seconds
and
4
git commands to generate.