diff options
| author | Rickard Green <[email protected]> | 2012-08-03 15:12:02 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-08-03 15:12:02 +0200 |
| commit | afb19a88ab89ae0b45e28555eee2a03d8215b1b1 (patch) | |
| tree | e6e6816f2ae9ab44b2b35243dc347648a4d4028e /erts/emulator/beam/erl_db.h | |
| parent | e76262ea8ac6986a497bb1e7fbf5e75668027473 (diff) | |
| parent | 88126e785de24f5f41068c610bc13840dcab4a7d (diff) | |
| download | otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.tar.gz otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.tar.bz2 otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.zip | |
Merge branch 'rickard/tab-unref-thr-prgr/OTP-10167'
* rickard/tab-unref-thr-prgr/OTP-10167:
Use thread progress instead of scheduling misc aux work were possible
Conflicts:
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/emulator/beam/erl_db.h')
| -rw-r--r-- | erts/emulator/beam/erl_db.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_db.h b/erts/emulator/beam/erl_db.h index 2e5deaf338..e9a661efbc 100644 --- a/erts/emulator/beam/erl_db.h +++ b/erts/emulator/beam/erl_db.h @@ -27,6 +27,10 @@ #define __DB_H__ #include "sys.h" +#undef ERL_THR_PROGRESS_TSD_TYPE_ONLY +#define ERL_THR_PROGRESS_TSD_TYPE_ONLY +#include "erl_thr_progress.h" +#undef ERL_THR_PROGRESS_TSD_TYPE_ONLY #include "bif.h" #include "erl_db_util.h" /* Flags */ @@ -36,6 +40,11 @@ Uint erts_get_ets_misc_mem_size(void); +typedef struct { + DbTableCommon common; + ErtsThrPrgrLaterOp data; +} DbTableRelease; + /* * So, the structure for a database table, NB this is only * interesting in db.c. @@ -44,6 +53,7 @@ union db_table { DbTableCommon common; /* Any type of db table */ DbTableHash hash; /* Linear hash array specific data */ DbTableTree tree; /* AVL tree specific data */ + DbTableRelease release; /*TT*/ }; |