Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
5d09d233
Commit
5d09d233
authored
7 years ago
by
Vladislav Shpilevoy
Committed by
Konstantin Osipov
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
small: remove region.name
parent
3902661a
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/fiber.c
+2
-2
2 additions, 2 deletions
src/fiber.c
src/fiber.h
+3
-2
3 additions, 2 deletions
src/fiber.h
src/lib/small
+1
-1
1 addition, 1 deletion
src/lib/small
test/unit/fiber.cc
+19
-0
19 additions, 0 deletions
test/unit/fiber.cc
test/unit/fiber.result
+8
-0
8 additions, 0 deletions
test/unit/fiber.result
with
33 additions
and
5 deletions
src/fiber.c
+
2
−
2
View file @
5d09d233
...
...
@@ -617,7 +617,7 @@ fiber_recycle(struct fiber *fiber)
assert
(
rlist_empty
(
&
fiber
->
state
));
bool
has_custom_stack
=
fiber
->
flags
&
FIBER_CUSTOM_STACK
;
fiber_reset
(
fiber
);
fiber
->
gc
.
name
[
0
]
=
'\0'
;
fiber
->
name
[
0
]
=
'\0'
;
fiber
->
f
=
NULL
;
memset
(
fiber
->
fls
,
0
,
sizeof
(
fiber
->
fls
));
unregister_fid
(
fiber
);
...
...
@@ -692,7 +692,7 @@ void
fiber_set_name
(
struct
fiber
*
fiber
,
const
char
*
name
)
{
assert
(
name
!=
NULL
);
region_set_name
(
&
fiber
->
gc
,
name
);
snprintf
(
fiber
->
name
,
sizeof
(
fiber
->
name
),
"%s"
,
name
);
}
extern
inline
void
...
...
This diff is collapsed.
Click to expand it.
src/fiber.h
+
3
−
2
View file @
5d09d233
...
...
@@ -50,7 +50,7 @@
extern
"C"
{
#endif
/* defined(__cplusplus) */
enum
{
FIBER_NAME_MAX
=
REGION_NAME_MAX
};
enum
{
FIBER_NAME_MAX
=
30
};
enum
{
/**
...
...
@@ -384,6 +384,7 @@ struct fiber {
void
*
fls
[
FIBER_KEY_MAX
];
/** Exception which caused this fiber's death. */
struct
diag
diag
;
char
name
[
FIBER_NAME_MAX
];
};
enum
{
FIBER_CALL_STACK
=
16
};
...
...
@@ -528,7 +529,7 @@ fiber_set_name(struct fiber *fiber, const char *name);
static
inline
const
char
*
fiber_name
(
struct
fiber
*
f
)
{
return
region_name
(
&
f
->
gc
)
;
return
f
->
name
;
}
bool
...
...
This diff is collapsed.
Click to expand it.
small
@
da2aa2c9
Compare
2e8d1a0e
...
da2aa2c9
Subproject commit
2e8d1a0e84fb863f56a233f0925cb0eb18a52d6a
Subproject commit
da2aa2c97bf76f73645326e9db36c4844bb5b691
This diff is collapsed.
Click to expand it.
test/unit/fiber.cc
+
19
−
0
View file @
5d09d233
...
...
@@ -141,9 +141,28 @@ fiber_join_test()
footer
();
}
void
fiber_name_test
()
{
header
();
note
(
"name of a new fiber: %s.
\n
"
,
fiber_name
(
fiber
()));
fiber_set_name
(
fiber
(),
"Horace"
);
note
(
"set new fiber name: %s.
\n
"
,
fiber_name
(
fiber
()));
fiber_set_name
(
fiber
(),
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
note
(
"fiber name is truncated: %s.
\n
"
,
fiber_name
(
fiber
()));
footer
();
}
static
int
main_f
(
va_list
ap
)
{
fiber_name_test
();
fiber_join_test
();
ev_break
(
loop
(),
EVBREAK_ALL
);
return
0
;
...
...
This diff is collapsed.
Click to expand it.
test/unit/fiber.result
+
8
−
0
View file @
5d09d233
#gh-1238: log uncaught errors
SystemError Failed to allocate 42 bytes in allocator for exception: Cannot allocate memory
*** fiber_name_test ***
# name of a new fiber: main.
# set new region name: region.
# fiber name is truncated: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa.
*** fiber_name_test: done ***
*** fiber_join_test ***
# exception propagated
# cancel dead has started
...
...
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