Attachment 851079 Details for Bug 1049359 – Trivial patch, committed to upstream already

[patch] Trivial patch, committed to upstream already

QPID-5485.patch (text/plain), 2.42 KB, created by Pavel Moravec on 2014-01-16 13:48:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2014-01-16 13:48:26 UTC

Size: 2.42 KB

patch

obsolete

>Index: cpp/src/qpid/broker/PagedQueue.cpp
>===================================================================
>--- cpp/src/qpid/broker/PagedQueue.cpp	(revision 1558751)
>+++ cpp/src/qpid/broker/PagedQueue.cpp	(working copy)
>@@ -75,6 +75,11 @@
>     QPID_LOG(debug, "PagedQueue[" << path << "]");
> }
> 
>+PagedQueue::~PagedQueue()
>+{
>+    file.close(path);
>+}
>+
> size_t PagedQueue::size()
> {
>     size_t total(0);
>Index: cpp/src/qpid/broker/PagedQueue.h
>===================================================================
>--- cpp/src/qpid/broker/PagedQueue.h	(revision 1558751)
>+++ cpp/src/qpid/broker/PagedQueue.h	(working copy)
>@@ -38,6 +38,7 @@
> class PagedQueue : public Messages {
>   public:
>     PagedQueue(const std::string& name, const std::string& directory, uint maxLoaded, uint pageFactor, ProtocolRegistry& protocols);
>+    ~PagedQueue();
>     size_t size();
>     bool deleted(const QueueCursor&);
>     void publish(const Message& added);
>Index: cpp/src/qpid/sys/MemoryMappedFile.h
>===================================================================
>--- cpp/src/qpid/sys/MemoryMappedFile.h	(revision 1558751)
>+++ cpp/src/qpid/sys/MemoryMappedFile.h	(working copy)
>@@ -40,6 +40,10 @@
>      */
>     QPID_COMMON_EXTERN std::string open(const std::string& name, const std::string& directory);
>     /**
>+     * Closes and removes the file that can be mapped by region into memory
>+     */
>+    QPID_COMMON_EXTERN void close(const std::string& path);
>+    /**
>      * Returns the page size
>      */
>     QPID_COMMON_EXTERN size_t getPageSize();
>Index: cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
>===================================================================
>--- cpp/src/qpid/sys/posix/MemoryMappedFile.cpp	(revision 1558751)
>+++ cpp/src/qpid/sys/posix/MemoryMappedFile.cpp	(working copy)
>@@ -71,6 +71,11 @@
>     state->fd = fd;
>     return path;
> }
>+void MemoryMappedFile::close(const std::string& path)
>+{
>+    ::close(state->fd);
>+    ::unlink(path.c_str());
>+}
> size_t MemoryMappedFile::getPageSize()
> {
>     return ::sysconf(_SC_PAGE_SIZE);
>Index: cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
>===================================================================
>--- cpp/src/qpid/sys/windows/MemoryMappedFile.cpp	(revision 1558751)
>+++ cpp/src/qpid/sys/windows/MemoryMappedFile.cpp	(working copy)
>@@ -31,6 +31,9 @@
> {
>     return std::string();
> }
>+void MemoryMappedFile::close(const std::string& /*path*/)
>+{
>+}
> size_t MemoryMappedFile::getPageSize()
> {
>     return 0;

Actions: View | Diff

Attachments on bug 1049359: 851079