2 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index cfbe6a0bcc..92eb6dd380 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -59,7 +59,9 @@ Broker::Options::Options(const std::string& name) :
     maxConnections(500),
     connectionBacklog(10),
     store(),
-    stagingThreshold(5000000)
+    stagingThreshold(5000000),
+	storeDir("/var"),
+	storeAsync(false)
 {
     addOptions()
         ("port,p", optValue(port,"PORT"),
@@ -73,7 +75,11 @@ Broker::Options::Options(const std::string& name) :
         ("staging-threshold", optValue(stagingThreshold, "N"),
          "Stages messages over N bytes to disk")
         ("store,s", optValue(store,"LIBNAME"),
-         "Tells the broker to use the message store shared library LIBNAME for persistence");
+         "Tells the broker to use the message store shared library LIBNAME for persistence")
+        ("store-diretcory", optValue(storeDir,"DIR"),
+         "Store directory location for persistence.")
+        ("store-async", optValue(storeAsync,"yes|no"),
+         "Use async persistence storage - if store supports it, enable AIO 0-DIRECT.");
 }
 
 const std::string empty;
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index acb059451a..b4b82e8433 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -64,6 +64,8 @@ class Broker : public sys::Runnable, public Plugin::Target
         int connectionBacklog;
         std::string store;      
         long stagingThreshold;
+		string storeDir;
+		bool storeAsync;
     };
     
     virtual ~Broker();