You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/31 20:58:28 UTC
svn commit: r809692 - in /commons/sandbox/runtime/trunk/src/main:
java/org/apache/commons/runtime/io/MemoryMapProvider.java
java/org/apache/commons/runtime/io/MemoryMappedFile.java
native/os/unix/pmmap.c native/os/win32/pmmap.c native/shared/clazz.c
Author: mturk
Date: Mon Aug 31 18:58:26 2009
New Revision: 809692
URL: http://svn.apache.org/viewvc?rev=809692&view=rev
Log:
Use Provider instead File for a name
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java
- copied, changed from r809687, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMappedFile.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMappedFile.java
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c
commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java (from r809687, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMappedFile.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMappedFile.java&r1=809687&r2=809692&rev=809692&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMappedFile.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java Mon Aug 31 18:58:26 2009
@@ -31,7 +31,7 @@
* <p>
* </p>
*/
-public class MemoryMappedFile implements java.io.Closeable
+public class MemoryMapProvider implements java.io.Closeable
{
/*
* Reference to the OS memory mapped file descriptor
@@ -45,12 +45,12 @@
*/
private Vector<Pointer> mappedRegions = new Vector<Pointer>(2);
- private MemoryMappedFile()
+ private MemoryMapProvider()
{
// No Instance
}
- private MemoryMappedFile(Descriptor map)
+ private MemoryMapProvider(Descriptor map)
{
this.map = map;
}
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c?rev=809692&r1=809691&r2=809692&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c Mon Aug 31 18:58:26 2009
@@ -46,7 +46,7 @@
J_DECLARE_CLAZZ = {
NULL,
NULL,
- ACR_IO_CLASS_PATH "MemoryMappedFile"
+ ACR_IO_CLASS_PATH "MemoryMapProvider"
};
J_DECLARE_M_ID(0000) = {
@@ -265,7 +265,7 @@
return 0;
}
-ACR_CLASS_LDEF(io_MemoryMappedFile)
+ACR_CLASS_LDEF(io_MemoryMapProvider)
{
int rv;
@@ -276,7 +276,7 @@
return ACR_SUCCESS;
}
-ACR_CLASS_UDEF(io_MemoryMappedFile)
+ACR_CLASS_UDEF(io_MemoryMapProvider)
{
ACR_UnloadClass(_E, &_clazzn);
}
@@ -329,10 +329,10 @@
return mapo;
}
-ACR_IO_EXPORT_DECLARE(jobject, MemoryMappedFile, map0)(ACR_JNISTDARGS,
- jint map,
- jlong offset,
- jlong size)
+ACR_IO_EXPORT_DECLARE(jobject, MemoryMapProvider, map0)(ACR_JNISTDARGS,
+ jint map,
+ jlong offset,
+ jlong size)
{
void *base = NULL;
jobject mptr = NULL;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c?rev=809692&r1=809691&r2=809692&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c Mon Aug 31 18:58:26 2009
@@ -45,7 +45,7 @@
J_DECLARE_CLAZZ = {
NULL,
NULL,
- ACR_IO_CLASS_PATH "MemoryMappedFile"
+ ACR_IO_CLASS_PATH "MemoryMapProvider"
};
J_DECLARE_M_ID(0000) = {
@@ -306,7 +306,7 @@
return 0;
}
-ACR_CLASS_LDEF(io_MemoryMappedFile)
+ACR_CLASS_LDEF(io_MemoryMapProvider)
{
int rv;
@@ -317,7 +317,7 @@
return ACR_SUCCESS;
}
-ACR_CLASS_UDEF(io_MemoryMappedFile)
+ACR_CLASS_UDEF(io_MemoryMapProvider)
{
ACR_UnloadClass(_E, &_clazzn);
}
@@ -370,10 +370,10 @@
return mapo;
}
-ACR_IO_EXPORT_DECLARE(jobject, MemoryMappedFile, map0)(ACR_JNISTDARGS,
- jint map,
- jlong offset,
- jlong size)
+ACR_IO_EXPORT_DECLARE(jobject, MemoryMapProvider, map0)(ACR_JNISTDARGS,
+ jint map,
+ jlong offset,
+ jlong size)
{
LARGE_INTEGER off;
void *base = NULL;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c?rev=809692&r1=809691&r2=809692&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c Mon Aug 31 18:58:26 2009
@@ -381,7 +381,7 @@
ACR_CLASS_LDEC(Semaphore);
ACR_CLASS_LDEC(SharedMemory);
ACR_CLASS_LDEC(io_File);
-ACR_CLASS_LDEC(io_MemoryMappedFile);
+ACR_CLASS_LDEC(io_MemoryMapProvider);
ACR_DECLARE(int) ACR_LoadRuntimeClasses(JNIEnv *_E)
{
@@ -397,7 +397,7 @@
ACR_CLASS_LRUN(Semaphore);
ACR_CLASS_LRUN(SharedMemory);
ACR_CLASS_LRUN(io_File);
- ACR_CLASS_LRUN(io_MemoryMappedFile);
+ ACR_CLASS_LRUN(io_MemoryMapProvider);
#ifdef WIN32
#endif
@@ -419,7 +419,7 @@
ACR_CLASS_URUN(Semaphore);
ACR_CLASS_URUN(SharedMemory);
ACR_CLASS_URUN(io_File);
- ACR_CLASS_URUN(io_MemoryMappedFile);
+ ACR_CLASS_URUN(io_MemoryMapProvider);
#ifdef WIN32
#endif