diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-12-11 10:31:54 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-12-11 10:31:54 +1100 |
| commit | 8c58c1191c7e51980452d275162c9ed5a54c2334 (patch) | |
| tree | 435d444e26fa9b5c77e0a39edced1b04960a253f /src/include/schema.h | |
| parent | 4df3f8d705c1176d970fe4ddd6ea6ae2d75c8ebf (diff) | |
| download | mongo-8c58c1191c7e51980452d275162c9ed5a54c2334.tar.gz | |
Revert 4df3f8d705c1176d970fe4ddd6ea6ae2d75c8ebf, pushed by mistake.
Diffstat (limited to 'src/include/schema.h')
| -rw-r--r-- | src/include/schema.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/include/schema.h b/src/include/schema.h index 649c1317134..ab06e1c0cad 100644 --- a/src/include/schema.h +++ b/src/include/schema.h @@ -68,8 +68,7 @@ struct __wt_table { #define WT_COLGROUPS(t) WT_MAX((t)->ncolgroups, 1) #define WT_WITH_SCHEMA_LOCK(session, op) do { \ - int schema_locked = 0, waited = 0; \ - struct timespec __start, __now; \ + int schema_locked = 0; \ WT_ASSERT(session, \ F_ISSET(session, WT_SESSION_SCHEMA_LOCKED) || \ !F_ISSET(session, WT_SESSION_NO_SCHEMA_LOCK)); \ @@ -78,15 +77,8 @@ struct __wt_table { session, &S2C(session)->schema_lock) == 0) { \ F_SET(session, WT_SESSION_SCHEMA_LOCKED); \ schema_locked = 1; \ - } else { \ - (void)__wt_epoch(session, &__now); \ - if (!waited) { \ - __start = __now; \ - waited = 1; \ - } else if (WT_TIMEDIFF(__now, __start) > WT_BILLION / 2)\ - abort(); \ + } else \ __wt_yield(); \ - } \ (op); \ if (schema_locked) { \ F_CLR(session, WT_SESSION_SCHEMA_LOCKED); \ |