Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
maestro-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
maestro
maestro-core
Commits
ba95ee29
Commit
ba95ee29
authored
Nov 6, 2020
by
Utz-Uwe Haus
Browse files
Options
Downloads
Patches
Plain Diff
fix mio_obj size mismatch segv
parent
01c36fcb
No related branches found
No related tags found
2 merge requests
!3
Jsc ci update
,
!2
update JSC-CI branch to devel
Pipeline
#51231
passed
Nov 6, 2020
Stage: build-and-test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
transport/mio.c
+51
-47
51 additions, 47 deletions
transport/mio.c
with
51 additions
and
47 deletions
transport/mio.c
+
51
−
47
View file @
ba95ee29
...
...
@@ -98,13 +98,15 @@ int obj_open(struct mio_obj_id *oid, struct mio_obj *obj)
struct
mio_op
op
;
memcpy
(
obj
->
mo_id
.
moi_bytes
,
(
void
*
)
oid
->
moi_bytes
,
128
);
oid
->
moi_bytes
,
MIO_OBJ_ID_LEN
);
memset
(
&
op
,
0
,
sizeof
op
);
DEBUG
(
"mio_obj_open...
\n
"
);
rc
=
mio_obj_open
(
oid
,
obj
,
&
op
);
if
(
rc
!=
0
)
return
rc
;
DEBUG
(
"mio_obj_open worked, wait on op...
\n
"
);
/* If the object doesn't exist, -ENOENT will be returned? */
...
...
@@ -119,7 +121,7 @@ int obj_open_busywait(struct mio_obj_id *oid, struct mio_obj *obj)
struct
mio_op
op
;
memcpy
(
obj
->
mo_id
.
moi_bytes
,
(
void
*
)
oid
->
moi_bytes
,
128
);
oid
->
moi_bytes
,
MIO_OBJ_ID_LEN
);
do
{
memset
(
&
op
,
0
,
sizeof
op
);
...
...
@@ -235,17 +237,17 @@ int obj_write_sync(struct mio_obj *obj, uint32_t num_iov, struct mio_iovec *iov)
void
obj_create_fail_cb
(
struct
mio_op
*
op
)
{
INFO
(
"\
e
[1;34m Callback level 2: failed to create semaphore \
e
[0m
\n
"
);
INFO
(
"
\
033
[1;34m Callback level 2: failed to create semaphore
\
033
[0m
\n
"
);
}
void
obj_create_success_cb
(
struct
mio_op
*
op
)
{
INFO
(
"\
e
[1;34m Callback level 2: semaphore ready. Safe to read. \
e
[0m
\n
"
);
INFO
(
"
\
033
[1;34m Callback level 2: semaphore ready. Safe to read.
\
033
[0m
\n
"
);
}
void
obj_write_fail_cb
(
struct
mio_op
*
op
)
{
INFO
(
"\
e
[1;34m Async write fail callback called \
e
[0m
\n
"
);
INFO
(
"
\
033
[1;34m Async write fail callback called
\
033
[0m
\n
"
);
int
i
;
struct
obj_io_cb_args
*
args
;
...
...
@@ -295,18 +297,18 @@ INFO ("Not checking semaphore preexistence\n");
void
obj_write_success_cb
(
struct
mio_op
*
op
)
{
INFO
(
"\
e
[1;34m Async write success callback called \
e
[0m
\n
"
);
INFO
(
"
\
033
[1;34m Async write success callback called
\
033
[0m
\n
"
);
struct
obj_io_cb_args
*
args
;
args
=
(
struct
obj_io_cb_args
*
)
op
->
mop_app_cbs
.
moc_cb_data
;
struct
mio_obj
sobj
;
if
(
!
(
0
==
obj_create_async
(
args
->
semid
,
&
sobj
)))
{
WARN
(
"\
e
[1;34m Callback level 1: Failed to create a semaphore objet with ID (errno: %d) \
e
[0m
\n
"
,
op
->
mop_rc
);
WARN
(
"
\
033
[1;34m Callback level 1: Failed to create a semaphore objet with ID (errno: %d)
\
033
[0m
\n
"
,
op
->
mop_rc
);
}
else
{
//free(args->iovec->miov_base);
WITH_MIO_OBJ_STR
(
idstr
,
(
struct
mstro_cdo_id
*
)
args
->
semid
,
INFO
(
"\
e
[1;34m Callback level 1: Asynchronously created a semaphore object with ID %s with success. \
e
[0m
\n
"
,
idstr
););
INFO
(
"
\
033
[1;34m Callback level 1: Asynchronously created a semaphore object with ID %s with success.
\
033
[0m
\n
"
,
idstr
););
}
// free(args->semid);
}
...
...
@@ -581,9 +583,10 @@ mstro_transport_mio_src_execute(mstro_cdo src, Mstro__Pool__TransferTicket* tick
// struct mio_thread thread;
// mio_thread_init(&thread);
struct
m
stro_cdo
_id
oid
;
struct
m
stro_cdo
_id
semid
;
struct
m
io_obj
_id
oid
;
struct
m
io_obj
_id
semid
;
assert
(
sizeof
(
struct
mstro_cdo_id
)
==
sizeof
(
struct
mio_obj_id
));
memcpy
(
&
semid
,
ticket
->
mio
->
semid
.
data
,
ticket
->
mio
->
semid
.
len
);
memcpy
(
&
oid
,
ticket
->
mio
->
objid
.
data
,
ticket
->
mio
->
objid
.
len
);
...
...
@@ -594,9 +597,10 @@ mstro_transport_mio_src_execute(mstro_cdo src, Mstro__Pool__TransferTicket* tick
INFO
(
"Sanity check object ID from ticket: %s
\n
"
,
idstr
););
/* the async op will copy oid/semid content, so it's safe to use stack-allocated structs */
if
(
!
(
MSTRO_OK
==
mstro_mio_obj_write_async
(
src
,
ticket
,
(
struct
mio_obj_id
*
)
&
oid
,
(
struct
mio_obj_id
*
)
&
semid
)))
{
&
oid
,
&
semid
)))
{
/* Already printed an error */
return
MSTRO_FAIL
;
}
...
...
@@ -616,7 +620,7 @@ mstro_transport_mio_dst_execute(mstro_cdo dst,
||
ticket
==
NULL
||
ticket
->
ticket_case
!=
MSTRO__POOL__TRANSFER_TICKET__TICKET_MIO
)
{
ERR
(
"mstro_transport_mio_dst_execute() called with invalid arguments (%p/%p/%d)
\n
"
,
dst
,
ticket
,
ticket
?
ticket
->
ticket_case
:
-
1
);
dst
,
ticket
,
ticket
?
(
int
)
ticket
->
ticket_case
:
-
1
);
return
MSTRO_INVARG
;
}
INFO
(
"Executing mio transport dst side for CDO %s
\n
"
,
dst
->
name
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment