Author: shuston
Date: Thu Oct 30 16:18:07 2008
New Revision: 709285
URL: http://svn.apache.org/viewvc?rev=709285&view=rev
Log:
Resolve Time diffs for Windows; add Windows version of asynch I/O layer.
Resolves QPID-1209
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/client/FailoverSession.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/FailoverSession.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/FailoverSession.cpp?rev=709285&r1=709284&r2=709285&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/FailoverSession.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/FailoverSession.cpp Thu Oct
30 16:18:07 2008
@@ -26,6 +26,7 @@
#include "qpid/log/Logger.h"
#include "qpid/log/Options.h"
#include "qpid/log/Statement.h"
+#include "qpid/sys/Time.h"
#include "qpid/client/FailoverConnection.h"
#include "qpid/client/FailoverSession.h"
@@ -377,7 +378,7 @@
if ( ! failover_in_progress )
break;
- usleep ( 1000 );
+ qpid::sys::usleep ( 1000 );
}
}
}
@@ -1416,7 +1417,7 @@
{
newSession = newConnection.newSession();
}
- catch ( const std::exception& error )
+ catch ( const std::exception& /*error*/ )
{
throw Exception(QPID_MSG("Can't create failover session."));
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h?rev=709285&r1=709284&r2=709285&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h Thu Oct 30 16:18:07
2008
@@ -26,11 +26,25 @@
namespace sys {
/**
- * This is a class intended to abstract the Unix concept of file descriptor or
the Windows concept of HANDLE
+ * This is a class intended to abstract the Unix concept of file descriptor
+ * or the Windows concept of HANDLE
*/
+// Windows-related classes
+class AsynchAcceptorPrivate;
+class AsynchAcceptResult;
+namespace windows {
+ class AsynchIO;
+}
+
+// General classes
class PollerHandle;
class IOHandlePrivate;
class IOHandle {
+
+ friend class AsynchAcceptorPrivate;
+ friend class AsynchAcceptResult;
+ friend class windows::AsynchIO;
+
friend class PollerHandle;
protected:
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp?rev=709285&r1=709284&r2=709285&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp Thu Oct 30
16:18:07 2008
@@ -32,6 +32,7 @@
#include <boost/thread/once.hpp>
+#include <queue>
#include <winsock2.h>
#include <mswsock.h>
#include <windows.h>
@@ -147,7 +148,7 @@
restart ();
}
-void AsynchAcceptor::restart(void) {
+void AsynchAcceptorPrivate::restart(void) {
DWORD bytesReceived = 0; // Not used, needed for AcceptEx API
AsynchAcceptResult *result = new AsynchAcceptResult(acceptedCallback,
this,
@@ -166,7 +167,7 @@
AsynchAcceptResult::AsynchAcceptResult(AsynchAcceptor::Callback cb,
- AsynchAcceptor *acceptor,
+ AsynchAcceptorPrivate *acceptor,
SOCKET listener)
: callback(cb), acceptor(acceptor), listener(listener) {
newSocket.reset (new Socket());
@@ -318,21 +319,27 @@
volatile bool queuedClose;
private:
- void close(void);
+ // Dispatch events that have completed.
+ void dispatchReadComplete(AsynchIO::BufferBase *buffer);
+ void notifyEof(void);
+ void notifyDisconnect(void);
+ void notifyClosed(void);
+ void notifyBuffersEmpty(void);
+ void notifyIdle(void);
/**
* Initiate a read operation. AsynchIO::dispatchReadComplete() will be
* called when the read is complete and data is available.
*/
- virtual void startRead(void);
+ void startRead(void);
/**
* Initiate a write of the specified buffer. There's no callback for
* write completion to the AsynchIO object.
*/
- virtual void startWrite(AsynchIO::BufferBase* buff);
+ void startWrite(AsynchIO::BufferBase* buff);
- virtual bool writesNotComplete();
+ void close(void);
/**
* readComplete is called when a read request is complete.
@@ -602,10 +609,6 @@
return;
}
-bool AsynchIO::writesNotComplete() {
- return writeInProgress;
-}
-
/*
* Close the socket and callback to say we've done it
*/
@@ -726,4 +729,17 @@
delete this;
}
-}} // namespace qpid::windows
+} // namespace windows
+
+AsynchIO* qpid::sys::AsynchIO::create(const Socket& s,
+ AsynchIO::ReadCallback rCb,
+ AsynchIO::EofCallback eofCb,
+ AsynchIO::DisconnectCallback disCb,
+ AsynchIO::ClosedCallback cCb,
+ AsynchIO::BuffersEmptyCallback eCb,
+ AsynchIO::IdleCallback iCb)
+{
+ return new qpid::sys::windows::AsynchIO(s, rCb, eofCb, disCb, cCb, eCb,
iCb);
+}
+
+}} // namespace qpid::sys
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h?rev=709285&r1=709284&r2=709285&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h Thu Oct
30 16:18:07 2008
@@ -22,7 +22,7 @@
*
*/
-#include "AsynchIO.h"
+#include "qpid/sys/AsynchIO.h"
#include "qpid/sys/Socket.h"
#include <memory.h>
#include <winsock2.h>
@@ -101,8 +101,6 @@
char addressBuffer[SOCKADDRBUFLEN];
};
-class AsynchIO;
-
class AsynchIoResult : public AsynchResult {
public:
typedef boost::function1<void, AsynchIoResult *> Completer;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h?rev=709285&r1=709284&r2=709285&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h Thu Oct 30
16:18:07 2008
@@ -65,9 +65,7 @@
}
bool Condition::wait(Mutex& mutex, const AbsTime& absoluteTime){
- boost::system_time st;
- toPtime(st, absoluteTime);
- return condition.timed_wait(mutex.mutex, st);
+ return condition.timed_wait(mutex.mutex, absoluteTime.getPrivate());
}
void Condition::notify(){
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp?rev=709285&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp Thu Oct 30
16:18:07 2008
@@ -0,0 +1,90 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/sys/Time.h"
+#include <ostream>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <windows.h>
+
+using namespace boost::posix_time;
+
+namespace qpid {
+namespace sys {
+
+AbsTime::AbsTime(const AbsTime& t, const Duration& d) {
+ if (d == Duration::max()) {
+ timepoint = ptime(max_date_time);
+ }
+ else {
+ time_duration td = microseconds(d.nanosecs / 1000);
+ timepoint = t.timepoint + td;
+ }
+}
+
+AbsTime AbsTime::FarFuture() {
+ AbsTime ff;
+ ptime maxd(max_date_time);
+ ff.timepoint = maxd;
+ return ff;
+}
+
+AbsTime AbsTime::now() {
+ AbsTime time_now;
+ time_now.timepoint = boost::get_system_time();
+ return time_now;
+}
+
+Duration::Duration(const AbsTime& time0) : nanosecs(0) {
+ time_period p(ptime(min_date_time), time0.timepoint);
+ nanosecs = p.length().total_nanoseconds();
+}
+
+Duration::Duration(const AbsTime& start, const AbsTime& finish) {
+ time_duration d = finish.timepoint - start.timepoint;
+ nanosecs = d.total_nanoseconds();
+}
+
+std::ostream& operator<<(std::ostream& o, const Duration& d) {
+ return o << int64_t(d) << "ns";
+}
+
+std::ostream& operator<<(std::ostream& o, const AbsTime& t) {
+ std::string time_string = to_simple_string(t.timepoint);
+ return o << time_string;
+}
+
+void toPtime(ptime& pt, const AbsTime& t) {
+ pt = t.getPrivate();
+}
+
+void sleep(int secs) {
+ ::Sleep(secs * 1000);
+}
+
+void usleep(uint32_t usecs) {
+ DWORD msecs = usecs / 1000;
+ if (msecs == 0)
+ msecs = 1;
+ ::Sleep(msecs);
+}
+
+}}
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
------------------------------------------------------------------------------
svn:keywords =
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h?rev=709285&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h Thu Oct 30
16:18:07 2008
@@ -0,0 +1,36 @@
+#ifndef QPID_SYS_WINDOWS_TIME_H
+#define QPID_SYS_WINDOWS_TIME_H
+
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+namespace qpid {
+namespace sys {
+
+/**
+ * Class to represent an instant in time. Boost has this stuff already done
+ * so just reuse it. We can also grab this for quick use with the Condition
+ * wait operations.
+ */
+typedef boost::posix_time::ptime TimePrivate;
+
+}} // namespace qpid::sys
+
+#endif /*!QPID_SYS_WINDOWS_TIME_H*/
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.h
------------------------------------------------------------------------------
svn:keywords =
