Changeset: bacc1c8fca4e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bacc1c8fca4e Modified Files: sql/server/sql_mvc.c sql/server/sql_mvc.h Branch: default Log Message:
inlined mvc_highwater.. diffs (40 lines): diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c --- a/sql/server/sql_mvc.c +++ b/sql/server/sql_mvc.c @@ -1664,15 +1664,3 @@ symbol_cmp(mvc *sql, symbol *s1, symbol { return _symbol_cmp(sql, s1, s2); } - -int -mvc_highwater(mvc *sql) -{ - int l = 0, rc = 0; - uintptr_t c = (uintptr_t) (&l); - - size_t diff = c < sql->sp ? sql->sp - c : c - sql->sp; - if (diff > THREAD_STACK_SIZE - 280 * 1024) - rc = 1; - return rc; -} diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h --- a/sql/server/sql_mvc.h +++ b/sql/server/sql_mvc.h @@ -304,6 +304,16 @@ extern void *sql_error(mvc *sql, int err __attribute__((__format__(__printf__, 3, 4))); extern int symbol_cmp(mvc* sql, symbol *s1, symbol *s2); -extern int mvc_highwater(mvc *sql); + +static inline int mvc_highwater(mvc *sql) +{ + int l = 0, rc = 0; + uintptr_t c = (uintptr_t) (&l); + + size_t diff = c < sql->sp ? sql->sp - c : c - sql->sp; + if (diff > THREAD_STACK_SIZE - 280 * 1024) + rc = 1; + return rc; +} #endif /*_SQL_MVC_H*/ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list