SERVER-18277 Track operation deadlines in OperationContext, not CurOp.

This also unifies the implementations of checkForInterrupt and checkForInterruptNoAssert.

1 files changed, 0 insertions, 106 deletions

diff --git a/src/mongo/db/curop_test.cpp b/src/mongo/db/curop_test.cpp
deleted file mode 100644
index 84c85e3cef9..00000000000
--- a/src/mongo/db/curop_test.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- *    Copyright (C) 2013 10gen Inc.
- *
- *    This program is free software: you can redistribute it and/or  modify
- *    it under the terms of the GNU Affero General Public License, version 3,
- *    as published by the Free Software Foundation.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Affero General Public License for more details.
- *
- *    You should have received a copy of the GNU Affero General Public License
- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the GNU Affero General Public License in all respects for
- *    all of the code used other than as permitted herein. If you modify file(s)
- *    with this exception, you may extend this exception to your version of the
- *    file(s), but you are not obligated to do so. If you do not wish to do so,
- *    delete this exception statement from your version. If you delete this
- *    exception statement from all source files in the program, then also delete
- *    it in the license file.
- */
-
-#include "mongo/platform/basic.h"
-
-#include "mongo/db/client.h"
-#include "mongo/db/curop.h"
-#include "mongo/db/operation_context_noop.h"
-#include "mongo/db/service_context.h"
-#include "mongo/db/service_context_noop.h"
-#include "mongo/platform/atomic_word.h"
-#include "mongo/stdx/memory.h"
-#include "mongo/stdx/thread.h"
-#include "mongo/unittest/unittest.h"
-
-namespace mongo {
-
-namespace {
-
-const long long intervalLong = 2000 * 1000;  // 2s in micros
-const long long intervalShort = 10 * 1000;   // 10ms in micros
-
-
-class TestListener : public Listener {
-public:
-    TestListener() : Listener("test", "", 0) {}  // port 0 => any available high port
-    void accepted(AbstractMessagingPort* mp) override {}
-};
-
-AtomicUInt32 threadInitialized(0);
-
-class TestListenerFixtureClass : public mongo::unittest::Test {
-protected:
-    /**
-     * This will start the global listener thread, t, if it hasn't been initialized yet.
-     */
-    void setUp() {
-        if (threadInitialized.fetchAndAdd(1) > 0) {
-            return;
-        }
-        stdx::thread t = stdx::thread([this]() {
-            TestListener listener;
-            listener.setAsTimeTracker();
-            listener.setupSockets();
-            listener.initAndListen();
-        });
-        t.detach();
-        // Wait for listener thread to start tracking time.
-        while (Listener::getElapsedTimeMillis() == 0) {
-            sleepmillis(10);
-        }
-    }
-};
-
-// Long operation + short timeout => time should expire.
-TEST_F(TestListenerFixtureClass, TimeHasExpiredPosSimple) {
-    auto service = stdx::make_unique<ServiceContextNoop>();
-    auto client = service->makeClient("CurOpTest");
-    OperationContextNoop txn(client.get(), 100);
-    CurOp curOp(&txn);
-    curOp.setMaxTimeMicros(intervalShort);
-    curOp.ensureStarted();
-    sleepmicros(intervalLong);
-    ASSERT_TRUE(curOp.maxTimeHasExpired());
-}
-
-// Short operation + long timeout => time should not expire.
-TEST_F(TestListenerFixtureClass, TimeHasExpiredNegSimple) {
-    auto service = stdx::make_unique<ServiceContextNoop>();
-    auto client = service->makeClient("CurOpTest");
-    OperationContextNoop txn(client.get(), 100);
-    CurOp curOp(&txn);
-    curOp.setMaxTimeMicros(intervalLong);
-    curOp.ensureStarted();
-    sleepmicros(intervalShort);
-    ASSERT_FALSE(curOp.maxTimeHasExpired());
-}
-
-}  // namespace
-
-}  // namespace mongo