From owner-svn-ports-all@freebsd.org Tue Sep 8 10:16:02 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C46A09CCF32; Tue, 8 Sep 2015 10:16:02 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B4BEF1616; Tue, 8 Sep 2015 10:16:02 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t88AG2eJ019780; Tue, 8 Sep 2015 10:16:02 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t88AG2Iq019778; Tue, 8 Sep 2015 10:16:02 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201509081016.t88AG2Iq019778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Tue, 8 Sep 2015 10:16:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396360 - head/devel/ice/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2015 10:16:02 -0000 Author: grembo Date: Tue Sep 8 10:16:01 2015 New Revision: 396360 URL: https://svnweb.freebsd.org/changeset/ports/396360 Log: Remove C++11 specific construct. PR: 201743 Approved by: mentors (implicit) Modified: head/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp head/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp Modified: head/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp ============================================================================== --- head/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp Tue Sep 8 09:45:50 2015 (r396359) +++ head/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp Tue Sep 8 10:16:01 2015 (r396360) @@ -4,105 +4,105 @@ { cout << "testing server request override... " << flush; -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; Ice::Context ctx; -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; ctx["serverOvrd"] = "test"; -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; for(int i = 0; i < 5; i++) { -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, i, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, i, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, i, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100)); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackOK(1, i) < 3); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; } -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(twowayR, 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackOK(1, 0) == 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; int count = 0; int nRetry = 0; do { -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->hold(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(onewayR, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(twowayR, 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200 + nRetry * 200)); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->activate(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackOK(1, 0) == 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; count = callbackReceiverImpl->callbackWithPayloadOK(0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->callbackWithPayloadOK(count); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; } while(count == 10 && nRetry++ < 10); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(count < 10); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->hold(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1000)); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->activate(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackWithPayloadOK(4) == 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; int remainingCallbacks = callbackReceiverImpl->callbackOK(1, 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; // // Occasionally, Glacier2 flushes in the middle of our 5 // callbacks, so we get more than 1 callback @@ -110,43 +110,43 @@ // time to receive this (these) extra callback(s). // test(remainingCallbacks <= 4); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; if(remainingCallbacks > 0) { -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackOK(remainingCallbacks, 0) == 0); } -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; ctx["_fwd"] = "O"; -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->hold(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallback(onewayR, 0, ctx); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; oneway->initiateCallbackWithPayload(twowayR); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200)); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; callbackReceiverImpl->activate(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackWithPayloadOK(3) == 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(callbackReceiverImpl->callbackOK(1, 0) == 0); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; cout << "ok" << endl; } Modified: head/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp ============================================================================== --- head/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp Tue Sep 8 09:45:50 2015 (r396359) +++ head/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp Tue Sep 8 10:16:01 2015 (r396360) @@ -4,46 +4,46 @@ ConditionPtr cond = new Condition(true); int value = 0; Ice::AsyncResultPtr result; -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; while(value < 3000 && cond->value()) { + if (!value) -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; result = holdSerialized->begin_set(value + 1, IceUtilInternal::random(1), newCallback_Hold_set(new SetCB(cond, value), &SetCB::response, &SetCB::exception)); + if (!value) -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; ++value; if(value % 100 == 0) { -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; result->waitForSent(); } } -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; result->waitForCompleted(); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; test(cond->value()); -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; for(int i = 0; i < 10000; ++i) { + if (value == 3000) -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; holdSerialized->ice_oneway()->setOneway(value + 1, value); + if (value == 3000) -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; ++value; if((i % 100) == 0) { -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; holdSerialized->ice_oneway()->putOnHold(1); } } -+ cout << __LINE__ << " (" << time(nullptr) << ")" << endl; ++ cout << __LINE__ << " (" << time(0) << ")" << endl; } cout << "ok" << endl;