aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile.in1
-rw-r--r--src/include/FileMapping.H65
-rw-r--r--src/include/storage.H19
-rw-r--r--src/utils/hammer.cc1
-rw-r--r--src/utils/sexpr.cc1
-rw-r--r--src/utils/storage.cc3
8 files changed, 75 insertions, 20 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fdc84220..00fb2c68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2013-06-21 Gabriel Dos Reis <gdr@integrable-solutions.net>
+ * include/FileMapping.H: New.
+
+2013-06-21 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
* include/dialect.H: New.
* include/diagnostics.H: Likewise.
* include/storage.H: Move from utils/.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d4c9d10..c7cc8bfa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ oa_src_include_headers = \
structure.H \
iterator.H \
storage.H \
+ FileMapping.H \
Input.H \
diagnostics.H \
dialect.H \
diff --git a/src/Makefile.in b/src/Makefile.in
index 2e1e78c8..8fa23c6f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -397,6 +397,7 @@ oa_src_include_headers = \
structure.H \
iterator.H \
storage.H \
+ FileMapping.H \
Input.H \
diagnostics.H \
dialect.H \
diff --git a/src/include/FileMapping.H b/src/include/FileMapping.H
new file mode 100644
index 00000000..0ab943fd
--- /dev/null
+++ b/src/include/FileMapping.H
@@ -0,0 +1,65 @@
+// Copyright (C) 2010-2013, Gabriel Dos Reis.
+// All rights reserved.
+// Written by Gabriel Dos Reis.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// - Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in
+// the documentation and/or other materials provided with the
+// distribution.
+//
+// - Neither the name of OpenAxiom. nor the names of its contributors
+// may be used to endorse or promote products derived from this
+// software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// --% Author: Gabriel Dos Reis
+// --% Description:
+// --% Provide random access read to files through file mapping.
+
+#ifndef OPENAXIOM_FILEMAPPING_included
+#define OPENAXIOM_FILEMAPPING_included
+
+#include <open-axiom/storage>
+
+namespace OpenAxiom {
+ namespace Memory {
+ // -----------------
+ // -- FileMapping --
+ // -----------------
+ struct FileMapping {
+ explicit FileMapping(std::string);
+ FileMapping(FileMapping&&);
+ ~FileMapping();
+ const Byte* begin() const { return start; }
+ const Byte* end() const { return begin() + extent; }
+ std::size_t size() const { return extent; }
+ protected:
+ Byte* start; // address at the mapped storage
+ size_t extent; // length (in bytes) of the storage
+ private:
+ FileMapping(const FileMapping&) = delete;
+ FileMapping& operator=(const FileMapping&) = delete;
+ };
+ }
+}
+
+#endif // OPENAXIOM_FILEMAPPING_included
+
diff --git a/src/include/storage.H b/src/include/storage.H
index cd3a723a..6800dc16 100644
--- a/src/include/storage.H
+++ b/src/include/storage.H
@@ -294,25 +294,6 @@ namespace OpenAxiom {
last->~T();
}
}
-
- // -----------------
- // -- FileMapping --
- // -----------------
- struct FileMapping {
- explicit FileMapping(std::string);
- FileMapping(FileMapping&&);
- ~FileMapping();
- const Byte* begin() const { return start; }
- const Byte* end() const { return begin() + extent; }
- std::size_t size() const { return extent; }
- protected:
- Byte* start; // address at the mapped storage
- size_t extent; // length (in bytes) of the storage
- private:
- FileMapping(const FileMapping&) = delete;
- FileMapping& operator=(const FileMapping&) = delete;
- };
-
}
}
diff --git a/src/utils/hammer.cc b/src/utils/hammer.cc
index eb07b378..1c7e050b 100644
--- a/src/utils/hammer.cc
+++ b/src/utils/hammer.cc
@@ -49,6 +49,7 @@
#include <vector>
#include <map>
#include <open-axiom/storage>
+#include <open-axiom/FileMapping>
namespace OpenAxiom {
namespace Hammer {
diff --git a/src/utils/sexpr.cc b/src/utils/sexpr.cc
index 77ed3060..499b566c 100644
--- a/src/utils/sexpr.cc
+++ b/src/utils/sexpr.cc
@@ -36,6 +36,7 @@
#include <iostream>
#include <iterator>
#include <open-axiom/sexpr>
+#include <open-axiom/FileMapping>
namespace OpenAxiom {
namespace Sexpr {
diff --git a/src/utils/storage.cc b/src/utils/storage.cc
index 183dcd20..80cfea0d 100644
--- a/src/utils/storage.cc
+++ b/src/utils/storage.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2011, Gabriel Dos Reis.
+// Copyright (C) 2010-2013, Gabriel Dos Reis.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
// --%: Gabriel Dos Reis.
#include <open-axiom/storage>
+#include <open-axiom/FileMapping>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif