Skip to content
Snippets Groups Projects
Commit 5d09d233 authored by Vladislav Shpilevoy's avatar Vladislav Shpilevoy Committed by Konstantin Osipov
Browse files

small: remove region.name

parent 3902661a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
Subproject commit 2e8d1a0e84fb863f56a233f0925cb0eb18a52d6a
Subproject commit da2aa2c97bf76f73645326e9db36c4844bb5b691
......@@ -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;
......
#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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment