RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debugging: show caller line at *path_make() and friends

This commit is contained in:
Thomas Schoebel-Theuer 2012-11-19 11:31:55 +01:00 committed by Thomas Schoebel-Theuer
parent af5b3100fb
commit 932a4c56ef
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sy_old/strategy.h
View File

@ -92,9 +92,16 @@ extern int mars_kill_brick_when_possible(struct mars_global *global, struct list
// mid-level brick instantiation (identity is based on path strings)
extern char *vpath_make(const char *fmt, va_list *args);
extern char *path_make(const char *fmt, ...);
extern char *backskip_replace(const char *path, char delim, bool insert, const char *fmt, ...);
extern char *_vpath_make(int line, const char *fmt, va_list *args);
extern char *_path_make(int line, const char *fmt, ...);
extern char *_backskip_replace(int line, const char *path, char delim, bool insert, const char *fmt, ...);
#define vpath_make(_fmt, _args) \
_vpath_make(__LINE__, _fmt, _args)
#define path_make(_fmt, _args...) \
_path_make(__LINE__, _fmt, ##_args)
#define backskip_replace(_path, _delim, _insert, _fmt, _args...) \
_backskip_replace(__LINE__, _path, _delim, _insert, _fmt, ##_args)
extern struct mars_brick *path_find_brick(struct mars_global *global, const void *brick_type, const char *fmt, ...);

18
sy_old/sy_generic.c
View File

@ -1208,33 +1208,33 @@ EXPORT_SYMBOL_GPL(mars_kill_brick_when_possible);
// mid-level brick instantiation (identity is based on path strings)
char *vpath_make(const char *fmt, va_list *args)
char *_vpath_make(int line, const char *fmt, va_list *args)
{
char *res = brick_string_alloc(MARS_PATH_MAX);
char *res = _brick_string_alloc(MARS_PATH_MAX, line);
if (likely(res)) {
vsnprintf(res, MARS_PATH_MAX, fmt, *args);
}
return res;
}
EXPORT_SYMBOL_GPL(vpath_make);
EXPORT_SYMBOL_GPL(_vpath_make);
char *path_make(const char *fmt, ...)
char *_path_make(int line, const char *fmt, ...)
{
va_list args;
char *res;
va_start(args, fmt);
res = vpath_make(fmt, &args);
res = _vpath_make(line, fmt, &args);
va_end(args);
return res;
}
EXPORT_SYMBOL_GPL(path_make);
EXPORT_SYMBOL_GPL(_path_make);
char *backskip_replace(const char *path, char delim, bool insert, const char *fmt, ...)
char *_backskip_replace(int line, const char *path, char delim, bool insert, const char *fmt, ...)
{
int path_len = strlen(path);
int total_len = strlen(fmt) + path_len + MARS_PATH_MAX;
char *res = brick_string_alloc(total_len + 1);
char *res = _brick_string_alloc(total_len + 1, line);
if (likely(res)) {
va_list args;
int pos = path_len;
@ -1260,7 +1260,7 @@ char *backskip_replace(const char *path, char delim, bool insert, const char *fm
}
return res;
}
EXPORT_SYMBOL_GPL(backskip_replace);
EXPORT_SYMBOL_GPL(_backskip_replace);
struct mars_brick *path_find_brick(struct mars_global *global, const void *brick_type, const char *fmt, ...)
{