You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2009/10/12 02:55:28 UTC
svn commit: r824209 [1/2] -
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/
Author: ndbeyer
Date: Mon Oct 12 00:55:27 2009
New Revision: 824209
URL: http://svn.apache.org/viewvc?rev=824209&view=rev
Log:
convert tabs to spaces - no functional changes
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java Mon Oct 12 00:55:27 2009
@@ -30,77 +30,77 @@
*/
abstract class AbstractMemorySpy implements IMemorySpy {
- // TODO: figure out how to prevent this being a synchronization bottleneck
- protected Map<PlatformAddress,AddressWrapper> memoryInUse = new HashMap<PlatformAddress, AddressWrapper>(); // Shadow to Wrapper
+ // TODO: figure out how to prevent this being a synchronization bottleneck
+ protected Map<PlatformAddress,AddressWrapper> memoryInUse = new HashMap<PlatformAddress, AddressWrapper>(); // Shadow to Wrapper
- protected Map<Reference,PlatformAddress> refToShadow = new HashMap<Reference, PlatformAddress>(); // Reference to Shadow
+ protected Map<Reference,PlatformAddress> refToShadow = new HashMap<Reference, PlatformAddress>(); // Reference to Shadow
- protected ReferenceQueue<Object> notifyQueue = new ReferenceQueue<Object>();
+ protected ReferenceQueue<Object> notifyQueue = new ReferenceQueue<Object>();
- final class AddressWrapper {
- final PlatformAddress shadow;
-
- final PhantomReference<PlatformAddress> wrAddress;
-
- volatile boolean autoFree = false;
-
- AddressWrapper(PlatformAddress address) {
- super();
- this.shadow = address.duplicate();
- this.wrAddress = new PhantomReference<PlatformAddress>(address, notifyQueue);
- }
- }
-
- public AbstractMemorySpy() {
- super();
- }
-
- public void alloc(PlatformAddress address) {
- AddressWrapper wrapper = new AddressWrapper(address);
- synchronized (this) {
- memoryInUse.put(wrapper.shadow, wrapper);
- refToShadow.put(wrapper.wrAddress, wrapper.shadow);
- }
- }
-
- public boolean free(PlatformAddress address) {
- AddressWrapper wrapper;
- synchronized (this) {
- wrapper = memoryInUse.remove(address);
- }
- if (wrapper == null) {
- // Attempt to free memory we didn't alloc
- System.err
- .println("Memory Spy! Fixed attempt to free memory that was not allocated " + address); //$NON-NLS-1$
- }
- return wrapper != null;
- }
-
- public void rangeCheck(PlatformAddress address, int offset, int length)
- throws IndexOutOfBoundsException {
- // Do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.harmony.luni.platform.struct.IMemorySpy#autoFree(org.apache.harmony.luni.platform.struct.PlatformAddress)
- */
- public void autoFree(PlatformAddress address) {
- AddressWrapper wrapper;
- synchronized (this) {
- wrapper = memoryInUse.get(address);
- }
- if (wrapper != null) {
- wrapper.autoFree = true;
- }
- }
-
- protected void orphanedMemory(Reference ref) {
- AddressWrapper wrapper;
- synchronized (this) {
- PlatformAddress shadow = refToShadow.remove(ref);
- wrapper = memoryInUse.get(shadow);
+ final class AddressWrapper {
+ final PlatformAddress shadow;
+
+ final PhantomReference<PlatformAddress> wrAddress;
+
+ volatile boolean autoFree = false;
+
+ AddressWrapper(PlatformAddress address) {
+ super();
+ this.shadow = address.duplicate();
+ this.wrAddress = new PhantomReference<PlatformAddress>(address, notifyQueue);
+ }
+ }
+
+ public AbstractMemorySpy() {
+ super();
+ }
+
+ public void alloc(PlatformAddress address) {
+ AddressWrapper wrapper = new AddressWrapper(address);
+ synchronized (this) {
+ memoryInUse.put(wrapper.shadow, wrapper);
+ refToShadow.put(wrapper.wrAddress, wrapper.shadow);
+ }
+ }
+
+ public boolean free(PlatformAddress address) {
+ AddressWrapper wrapper;
+ synchronized (this) {
+ wrapper = memoryInUse.remove(address);
+ }
+ if (wrapper == null) {
+ // Attempt to free memory we didn't alloc
+ System.err
+ .println("Memory Spy! Fixed attempt to free memory that was not allocated " + address); //$NON-NLS-1$
+ }
+ return wrapper != null;
+ }
+
+ public void rangeCheck(PlatformAddress address, int offset, int length)
+ throws IndexOutOfBoundsException {
+ // Do nothing
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.harmony.luni.platform.struct.IMemorySpy#autoFree(org.apache.harmony.luni.platform.struct.PlatformAddress)
+ */
+ public void autoFree(PlatformAddress address) {
+ AddressWrapper wrapper;
+ synchronized (this) {
+ wrapper = memoryInUse.get(address);
+ }
+ if (wrapper != null) {
+ wrapper.autoFree = true;
+ }
+ }
+
+ protected void orphanedMemory(Reference ref) {
+ AddressWrapper wrapper;
+ synchronized (this) {
+ PlatformAddress shadow = refToShadow.remove(ref);
+ wrapper = memoryInUse.get(shadow);
if (wrapper != null) {
// There is a leak if we were not auto-freeing this memory.
if (!wrapper.autoFree) {
@@ -109,7 +109,7 @@
}
wrapper.shadow.free();
}
- }
+ }
ref.clear();
- }
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java Mon Oct 12 00:55:27 2009
@@ -25,70 +25,70 @@
*/
final class DebugMemorySpy extends AbstractMemorySpy {
- private final boolean stackDump = true;
+ private final boolean stackDump = true;
- public DebugMemorySpy() {
- super();
- startSpy();
- }
+ public DebugMemorySpy() {
+ super();
+ startSpy();
+ }
- public boolean free(PlatformAddress address) {
- boolean vetoed = super.free(address);
- if (!vetoed && stackDump) {
- Thread.dumpStack();
- }
- return vetoed;
- }
+ public boolean free(PlatformAddress address) {
+ boolean vetoed = super.free(address);
+ if (!vetoed && stackDump) {
+ Thread.dumpStack();
+ }
+ return vetoed;
+ }
- /*
- * If this is memory that we allocated then we can check the access is
- * within range. However, we cannot check the range for memory that has been
- * allocated by the OS, or for addresses that we have computed. i.e. it is
- * quite possible that the range checker does <em>not</em> catch some
- * buffer overruns.
- */
- public void rangeCheck(PlatformAddress address, int offset, int length)
- throws IndexOutOfBoundsException {
- AddressWrapper wrapper = (AddressWrapper) memoryInUse.get(address);
- if (wrapper != null) {
- PlatformAddress accessStart = address.offsetBytes(offset);
- PlatformAddress accessEnd = accessStart.offsetBytes(length);
- PlatformAddress allocStart = wrapper.shadow;
- PlatformAddress allocEnd = allocStart.offsetBytes(address.size);
- boolean under = (accessStart.compareTo(allocStart)) == -1;
- boolean over = (accessEnd.compareTo(allocEnd)) == 1;
- if (under || over) {
- System.err.println("Memory Spy! Access out of allocated range"); //$NON-NLS-1$
- System.err
- .println("\tAlloc range : [" + allocStart + " ... " + allocEnd + "]"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- System.err
- .println("\tAccess range : [" + accessStart + " ... " + accessEnd + "]"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- if (stackDump) {
- Thread.dumpStack();
- }
- // throw new IndexOutOfBoundsException();
- }
- }
- }
+ /*
+ * If this is memory that we allocated then we can check the access is
+ * within range. However, we cannot check the range for memory that has been
+ * allocated by the OS, or for addresses that we have computed. i.e. it is
+ * quite possible that the range checker does <em>not</em> catch some
+ * buffer overruns.
+ */
+ public void rangeCheck(PlatformAddress address, int offset, int length)
+ throws IndexOutOfBoundsException {
+ AddressWrapper wrapper = (AddressWrapper) memoryInUse.get(address);
+ if (wrapper != null) {
+ PlatformAddress accessStart = address.offsetBytes(offset);
+ PlatformAddress accessEnd = accessStart.offsetBytes(length);
+ PlatformAddress allocStart = wrapper.shadow;
+ PlatformAddress allocEnd = allocStart.offsetBytes(address.size);
+ boolean under = (accessStart.compareTo(allocStart)) == -1;
+ boolean over = (accessEnd.compareTo(allocEnd)) == 1;
+ if (under || over) {
+ System.err.println("Memory Spy! Access out of allocated range"); //$NON-NLS-1$
+ System.err
+ .println("\tAlloc range : [" + allocStart + " ... " + allocEnd + "]"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+ System.err
+ .println("\tAccess range : [" + accessStart + " ... " + accessEnd + "]"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ if (stackDump) {
+ Thread.dumpStack();
+ }
+ // throw new IndexOutOfBoundsException();
+ }
+ }
+ }
- private void startSpy() {
- Thread spy = new Thread(new Runnable() {
- public void run() {
- while (true) {
- try {
- orphanedMemory(notifyQueue.remove()); // Blocks until
- // notified of
- // collected
- // reference
- } catch (InterruptedException e) {
- // Ignore interruptions
- }
- }
- }
- });
- spy.setDaemon(true);
- spy.setName("Platform Interface Memory Spy"); //$NON-NLS-1$
- spy.setPriority(Thread.MAX_PRIORITY);
- spy.start();
- }
+ private void startSpy() {
+ Thread spy = new Thread(new Runnable() {
+ public void run() {
+ while (true) {
+ try {
+ orphanedMemory(notifyQueue.remove()); // Blocks until
+ // notified of
+ // collected
+ // reference
+ } catch (InterruptedException e) {
+ // Ignore interruptions
+ }
+ }
+ }
+ });
+ spy.setDaemon(true);
+ spy.setName("Platform Interface Memory Spy"); //$NON-NLS-1$
+ spy.setPriority(Thread.MAX_PRIORITY);
+ spy.start();
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java Mon Oct 12 00:55:27 2009
@@ -22,34 +22,34 @@
*
*/
public final class Endianness {
- /**
- * Private mapping mode (equivalent to copy on write).
- */
- public static final Endianness BIG_ENDIAN = new Endianness("BIG_ENDIAN"); //$NON-NLS-1$
+ /**
+ * Private mapping mode (equivalent to copy on write).
+ */
+ public static final Endianness BIG_ENDIAN = new Endianness("BIG_ENDIAN"); //$NON-NLS-1$
- /**
- * Read-only mapping mode.
- */
- public static final Endianness LITTLE_ENDIAN = new Endianness(
- "LITTLE_ENDIAN"); //$NON-NLS-1$
+ /**
+ * Read-only mapping mode.
+ */
+ public static final Endianness LITTLE_ENDIAN = new Endianness(
+ "LITTLE_ENDIAN"); //$NON-NLS-1$
- // The string used to display the mapping mode.
- private final String displayName;
+ // The string used to display the mapping mode.
+ private final String displayName;
- /*
- * Private constructor prevents others creating new Endians.
- */
- private Endianness(String displayName) {
- super();
- this.displayName = displayName;
- }
+ /*
+ * Private constructor prevents others creating new Endians.
+ */
+ private Endianness(String displayName) {
+ super();
+ this.displayName = displayName;
+ }
- /**
- * Answers a string version of the endianness
- *
- * @return the mode string.
- */
- public String toString() {
- return displayName;
- }
+ /**
+ * Answers a string version of the endianness
+ *
+ * @return the mode string.
+ */
+ public String toString() {
+ return displayName;
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java Mon Oct 12 00:55:27 2009
@@ -24,98 +24,98 @@
public interface ICommonDataTypes {
- // Nothing
- public static final int SIZEOF_NO_BYTES = 0;
+ // Nothing
+ public static final int SIZEOF_NO_BYTES = 0;
- public static final int SIZEOF_VOID = SIZEOF_NO_BYTES;
+ public static final int SIZEOF_VOID = SIZEOF_NO_BYTES;
- // One byte
- public static final int SIZEOF_ONE_BYTE = 1;
+ // One byte
+ public static final int SIZEOF_ONE_BYTE = 1;
- public static final int SIZEOF_UNSIGNED_CHAR = SIZEOF_ONE_BYTE; // ANSI C
+ public static final int SIZEOF_UNSIGNED_CHAR = SIZEOF_ONE_BYTE; // ANSI C
- public static final int SIZEOF_JBOOLEAN = SIZEOF_ONE_BYTE; // Java language
+ public static final int SIZEOF_JBOOLEAN = SIZEOF_ONE_BYTE; // Java language
- public static final int SIZEOF_BOOLEAN = SIZEOF_ONE_BYTE;
+ public static final int SIZEOF_BOOLEAN = SIZEOF_ONE_BYTE;
- public static final int SIZEOF_BOOL = SIZEOF_ONE_BYTE;
+ public static final int SIZEOF_BOOL = SIZEOF_ONE_BYTE;
- public static final int SIZEOF_SIGNED_8_BITS = SIZEOF_ONE_BYTE;
+ public static final int SIZEOF_SIGNED_8_BITS = SIZEOF_ONE_BYTE;
- public static final int SIZEOF_SIGNED_CHAR = SIZEOF_ONE_BYTE; // ANSI C
+ public static final int SIZEOF_SIGNED_CHAR = SIZEOF_ONE_BYTE; // ANSI C
- public static final int SIZEOF_JBYTE = SIZEOF_ONE_BYTE; // Java language
+ public static final int SIZEOF_JBYTE = SIZEOF_ONE_BYTE; // Java language
- // Two bytes
- public static final int SIZEOF_TWO_BYTES = 2;
+ // Two bytes
+ public static final int SIZEOF_TWO_BYTES = 2;
- public static final int SIZEOF_UNSIGNED_SHORT = SIZEOF_TWO_BYTES; // ANSI
- // C
+ public static final int SIZEOF_UNSIGNED_SHORT = SIZEOF_TWO_BYTES; // ANSI
+ // C
- public static final int SIZEOF_JCHAR = SIZEOF_TWO_BYTES; // Java language
+ public static final int SIZEOF_JCHAR = SIZEOF_TWO_BYTES; // Java language
- public static final int SIZEOF_UINT16 = SIZEOF_TWO_BYTES; // Common
- // abbreviation
+ public static final int SIZEOF_UINT16 = SIZEOF_TWO_BYTES; // Common
+ // abbreviation
- public static final int SIZEOF_SIGNED_16_BITS = SIZEOF_TWO_BYTES;
+ public static final int SIZEOF_SIGNED_16_BITS = SIZEOF_TWO_BYTES;
- public static final int SIZEOF_SIGNED_SHORT = SIZEOF_TWO_BYTES; // ANSI C
+ public static final int SIZEOF_SIGNED_SHORT = SIZEOF_TWO_BYTES; // ANSI C
- public static final int SIZEOF_JSHORT = SIZEOF_TWO_BYTES; // Java language
+ public static final int SIZEOF_JSHORT = SIZEOF_TWO_BYTES; // Java language
- public static final int SIZEOF_SHORT = SIZEOF_TWO_BYTES; // Common
- // convention
+ public static final int SIZEOF_SHORT = SIZEOF_TWO_BYTES; // Common
+ // convention
- public static final int SIZEOF_INT16 = SIZEOF_TWO_BYTES; // Common
- // abbreviation
+ public static final int SIZEOF_INT16 = SIZEOF_TWO_BYTES; // Common
+ // abbreviation
- // Four bytes
- public static final int SIZE_OF_FOUR_BYTES = 4;
+ // Four bytes
+ public static final int SIZE_OF_FOUR_BYTES = 4;
- public static final int SIZEOF_UNSIGNED_32_BITS = SIZE_OF_FOUR_BYTES;
+ public static final int SIZEOF_UNSIGNED_32_BITS = SIZE_OF_FOUR_BYTES;
- public static final int SIZEOF_UINT32 = SIZE_OF_FOUR_BYTES; // Common
- // abbreviation
+ public static final int SIZEOF_UINT32 = SIZE_OF_FOUR_BYTES; // Common
+ // abbreviation
- public static final int SIZEOF_UNSIGNED_LONG = SIZE_OF_FOUR_BYTES; // Common
- // convention
+ public static final int SIZEOF_UNSIGNED_LONG = SIZE_OF_FOUR_BYTES; // Common
+ // convention
- public static final int SIZEOF_SIGNED_32_BITS = SIZE_OF_FOUR_BYTES;
+ public static final int SIZEOF_SIGNED_32_BITS = SIZE_OF_FOUR_BYTES;
- public static final int SIZEOF_SIGNED_LONG = SIZE_OF_FOUR_BYTES; // ANSI
- // C
+ public static final int SIZEOF_SIGNED_LONG = SIZE_OF_FOUR_BYTES; // ANSI
+ // C
- public static final int SIZEOF_JINT = SIZE_OF_FOUR_BYTES; // Java language
+ public static final int SIZEOF_JINT = SIZE_OF_FOUR_BYTES; // Java language
- public static final int SIZEOF_JSIZE = SIZE_OF_FOUR_BYTES; // Java language
+ public static final int SIZEOF_JSIZE = SIZE_OF_FOUR_BYTES; // Java language
- public static final int SIZEOF_LONG = SIZE_OF_FOUR_BYTES; // Common
- // abbreviation
+ public static final int SIZEOF_LONG = SIZE_OF_FOUR_BYTES; // Common
+ // abbreviation
- public static final int SIZEOF_INT32 = SIZE_OF_FOUR_BYTES; // Common
- // abbreviation
+ public static final int SIZEOF_INT32 = SIZE_OF_FOUR_BYTES; // Common
+ // abbreviation
- public static final int SIZEOF_IEEE754_32_BITS = SIZE_OF_FOUR_BYTES;
+ public static final int SIZEOF_IEEE754_32_BITS = SIZE_OF_FOUR_BYTES;
- public static final int SIZEOF_JFLOAT = SIZE_OF_FOUR_BYTES; // Java language
+ public static final int SIZEOF_JFLOAT = SIZE_OF_FOUR_BYTES; // Java language
- public static final int SIZEOF_FLOAT = SIZE_OF_FOUR_BYTES; // Common
- // convention
+ public static final int SIZEOF_FLOAT = SIZE_OF_FOUR_BYTES; // Common
+ // convention
- // Eight bytes
- public static final int SIZEOF_EIGHT_BYTES = 8;
+ // Eight bytes
+ public static final int SIZEOF_EIGHT_BYTES = 8;
- public static final int SIZEOF_UNSIGNED_64_BITS = SIZEOF_EIGHT_BYTES;
+ public static final int SIZEOF_UNSIGNED_64_BITS = SIZEOF_EIGHT_BYTES;
- public static final int SIZEOF_SIGNED_64_BITS = SIZEOF_EIGHT_BYTES;
+ public static final int SIZEOF_SIGNED_64_BITS = SIZEOF_EIGHT_BYTES;
- public static final int SIZEOF_JLONG = SIZEOF_EIGHT_BYTES; // Java language
+ public static final int SIZEOF_JLONG = SIZEOF_EIGHT_BYTES; // Java language
- public static final int SIZEOF_IEEE754_64_BITS = SIZEOF_EIGHT_BYTES;
+ public static final int SIZEOF_IEEE754_64_BITS = SIZEOF_EIGHT_BYTES;
- public static final int SIZEOF_JDOUBLE = SIZEOF_EIGHT_BYTES; // Java
- // language
+ public static final int SIZEOF_JDOUBLE = SIZEOF_EIGHT_BYTES; // Java
+ // language
- public static final int SIZEOF_DOUBLE = SIZEOF_EIGHT_BYTES; // Common
- // convention
+ public static final int SIZEOF_DOUBLE = SIZEOF_EIGHT_BYTES; // Common
+ // convention
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java Mon Oct 12 00:55:27 2009
@@ -27,82 +27,82 @@
*/
public interface IFileSystem {
- public final int SHARED_LOCK_TYPE = 1;
+ public final int SHARED_LOCK_TYPE = 1;
- public final int EXCLUSIVE_LOCK_TYPE = 2;
+ public final int EXCLUSIVE_LOCK_TYPE = 2;
- public final int SEEK_SET = 1;
+ public final int SEEK_SET = 1;
- public final int SEEK_CUR = 2;
+ public final int SEEK_CUR = 2;
- public final int SEEK_END = 4;
+ public final int SEEK_END = 4;
- public final int O_RDONLY = 0x00000000;
+ public final int O_RDONLY = 0x00000000;
- public final int O_WRONLY = 0x00000001;
+ public final int O_WRONLY = 0x00000001;
- public final int O_RDWR = 0x00000010;
+ public final int O_RDWR = 0x00000010;
- public final int O_RDWRSYNC = 0x00000020;
-
- public final int O_APPEND = 0x00000100;
+ public final int O_RDWRSYNC = 0x00000020;
+
+ public final int O_APPEND = 0x00000100;
- public final int O_CREAT = 0x00001000;
+ public final int O_CREAT = 0x00001000;
- public final int O_EXCL = 0x00010000;
+ public final int O_EXCL = 0x00010000;
- public final int O_NOCTTY = 0x00100000;
+ public final int O_NOCTTY = 0x00100000;
- public final int O_NONBLOCK = 0x01000000;
+ public final int O_NONBLOCK = 0x01000000;
- public final int O_TRUNC = 0x10000000;
+ public final int O_TRUNC = 0x10000000;
- public long read(long fileDescriptor, byte[] bytes, int offset, int length)
- throws IOException;
+ public long read(long fileDescriptor, byte[] bytes, int offset, int length)
+ throws IOException;
- public long write(long fileDescriptor, byte[] bytes, int offset, int length)
- throws IOException;
+ public long write(long fileDescriptor, byte[] bytes, int offset, int length)
+ throws IOException;
- public long readv(long fileDescriptor, long[] addresses, int[] offsets,
- int[] lengths, int size) throws IOException;
+ public long readv(long fileDescriptor, long[] addresses, int[] offsets,
+ int[] lengths, int size) throws IOException;
- public long writev(long fileDescriptor, long[] addresses, int[] offsets,
- int[] lengths, int size) throws IOException;
+ public long writev(long fileDescriptor, long[] addresses, int[] offsets,
+ int[] lengths, int size) throws IOException;
- // Required to support direct byte buffers
- public long readDirect(long fileDescriptor, long address, int offset,
- int length) throws IOException;
+ // Required to support direct byte buffers
+ public long readDirect(long fileDescriptor, long address, int offset,
+ int length) throws IOException;
- public long writeDirect(long fileDescriptor, long address, int offset,
- int length) throws IOException;
+ public long writeDirect(long fileDescriptor, long address, int offset,
+ int length) throws IOException;
- public boolean lock(long fileDescriptor, long start, long length, int type,
- boolean waitFlag) throws IOException;
+ public boolean lock(long fileDescriptor, long start, long length, int type,
+ boolean waitFlag) throws IOException;
- public void unlock(long fileDescriptor, long start, long length)
- throws IOException;
+ public void unlock(long fileDescriptor, long start, long length)
+ throws IOException;
- public long seek(long fileDescriptor, long offset, int whence)
- throws IOException;
+ public long seek(long fileDescriptor, long offset, int whence)
+ throws IOException;
- public void fflush(long fileDescriptor, boolean metadata)
- throws IOException;
+ public void fflush(long fileDescriptor, boolean metadata)
+ throws IOException;
- public void close(long fileDescriptor) throws IOException;
+ public void close(long fileDescriptor) throws IOException;
- public void truncate(long fileDescriptor, long size) throws IOException;
+ public void truncate(long fileDescriptor, long size) throws IOException;
- /**
- * Returns the granularity for virtual memory allocation.
- */
- public int getAllocGranularity() throws IOException;
+ /**
+ * Returns the granularity for virtual memory allocation.
+ */
+ public int getAllocGranularity() throws IOException;
- public long open(byte[] fileName, int mode) throws FileNotFoundException;
+ public long open(byte[] fileName, int mode) throws FileNotFoundException;
- public long transfer(long fileHandler, FileDescriptor socketDescriptor,
- long offset, long count) throws IOException;
+ public long transfer(long fileHandler, FileDescriptor socketDescriptor,
+ long offset, long count) throws IOException;
- public long ttyAvailable() throws IOException;
-
- public long ttyRead(byte[] bytes, int offset, int length) throws IOException;
+ public long ttyAvailable() throws IOException;
+
+ public long ttyRead(byte[] bytes, int offset, int length) throws IOException;
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java Mon Oct 12 00:55:27 2009
@@ -25,22 +25,22 @@
*/
public interface IMemorySpy {
- public void alloc(PlatformAddress address);
+ public void alloc(PlatformAddress address);
- // Has a veto: true == do free,false = don't
- public boolean free(PlatformAddress address);
+ // Has a veto: true == do free,false = don't
+ public boolean free(PlatformAddress address);
- public void rangeCheck(PlatformAddress address, int offset, int length)
- throws IndexOutOfBoundsException;
+ public void rangeCheck(PlatformAddress address, int offset, int length)
+ throws IndexOutOfBoundsException;
- /**
- * Requests that the given address is freed automatically when it becomes
- * garbage. If the address is alredy freed, or has not been notified as
- * allocated via this memory spy, then this call has no effect and completes
- * quietly.
- *
- * @param address
- * the address to be freed.
- */
- public void autoFree(PlatformAddress address);
+ /**
+ * Requests that the given address is freed automatically when it becomes
+ * garbage. If the address is alredy freed, or has not been notified as
+ * allocated via this memory spy, then this call has no effect and completes
+ * quietly.
+ *
+ * @param address
+ * the address to be freed.
+ */
+ public void autoFree(PlatformAddress address);
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java Mon Oct 12 00:55:27 2009
@@ -44,146 +44,146 @@
*/
public final int MMAP_WRITE_COPY = 4;
- /**
- * Answers true if the platform is little endian, otherwise it may be
- * assumed to be big endian..
- *
- * @return true if the platform is little endian.
- */
- public boolean isLittleEndian();
-
- /**
- * Answers the platform pointer size.
- *
- * @return the native platform pointer size, in bytes.
- */
- public int getPointerSize();
-
- /**
- * Allocates and returns a pointer to space for a memory block of
- * <code>length</code> bytes. The space is uninitialized and may be larger
- * than the number of bytes requested; however, the guaranteed usable memory
- * block is exactly <code>length</code> bytes long.
- *
- * @param length
- * number of bytes requested.
- * @return the address of the start of the memory block.
- * @throws OutOfMemoryError
- * if the request cannot be satisfied.
- */
- public long malloc(long length) throws OutOfMemoryError;
-
- /**
- * Deallocates space for a memory block that was previously allocated by a
- * call to {@link #malloc(long) malloc(long)}. The number of bytes freed is
- * identical to the number of bytes acquired when the memory block was
- * allocated. If <code>address</code> is zero the method does nothing.
- * <p>
- * Freeing a pointer to a memory block that was not allocated by
- * <code>malloc()</code> has unspecified effect.
- * </p>
- *
- * @param address
- * the address of the memory block to deallocate.
- */
- public void free(long address);
-
- /**
- * Places <code>value</code> into first <code>length</code> bytes of the
- * memory block starting at <code>address</code>.
- * <p>
- * The behavior is unspecified if
- * <code>(address ... address + length)</code> is not wholly within the
- * range that was previously allocated using <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the address of the first memory location.
- * @param value
- * the byte value to set at each location.
- * @param length
- * the number of byte-length locations to set.
- */
- public void memset(long address, byte value, long length);
-
- /**
- * Copies <code>length</code> bytes from <code>srcAddress</code> to
- * <code>destAddress</code>. Where any part of the source memory block
- * and the destination memory block overlap <code>memmove()</code> ensures
- * that the original source bytes in the overlapping region are copied
- * before being overwritten.
- * <p>
- * The behavior is unspecified if
- * <code>(srcAddress ... srcAddress + length)</code> and
- * <code>(destAddress ... destAddress + length)</code> are not both wholly
- * within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param destAddress
- * the address of the destination memory block.
- * @param srcAddress
- * the address of the source memory block.
- * @param length
- * the number of bytes to move.
- */
- public void memmove(long destAddress, long srcAddress, long length);
-
- /**
- * Copies <code>length</code> bytes from the memory block at
- * <code>address</code> into the byte array <code>bytes</code> starting
- * at element <code>offset</code> within the byte array.
- * <p>
- * The behavior of this method is undefined if the range
- * <code>(address ... address + length)</code> is not within a memory
- * block that was allocated using {@link #malloc(long) malloc(long)}.
- * </p>
- *
- * @param address
- * the address of the OS memory block from which to copy bytes.
- * @param bytes
- * the byte array into which to copy the bytes.
- * @param offset
- * the index of the first element in <code>bytes</code> that
- * will be overwritten.
- * @param length
- * the total number of bytes to copy into the byte array.
- * @throws NullPointerException
- * if <code>bytes</code> is <code>null</code>.
- * @throws IndexOutOfBoundsException
- * if <code>offset + length > bytes.length</code>.
- */
- public void getByteArray(long address, byte[] bytes, int offset, int length)
- throws NullPointerException, IndexOutOfBoundsException;
-
- /**
- * Copies <code>length</code> bytes from the byte array <code>bytes</code>
- * into the memory block at <code>address</code>, starting at element
- * <code>offset</code> within the byte array.
- * <p>
- * The behavior of this method is undefined if the range
- * <code>(address ... address + length)</code> is not within a memory
- * block that was allocated using {@link #malloc(long) malloc(long)}.
- * </p>
- *
- * @param address
- * the address of the OS memory block into which to copy the
- * bytes.
- * @param bytes
- * the byte array from which to copy the bytes.
- * @param offset
- * the index of the first element in <code>bytes</code> that
- * will be read.
- * @param length
- * the total number of bytes to copy from <code>bytes</code>
- * into the memory block.
- * @throws NullPointerException
- * if <code>bytes</code> is <code>null</code>.
- * @throws IndexOutOfBoundsException
- * if <code>offset + length > bytes.length</code>.
- */
- public void setByteArray(long address, byte[] bytes, int offset, int length)
- throws NullPointerException, IndexOutOfBoundsException;
+ /**
+ * Answers true if the platform is little endian, otherwise it may be
+ * assumed to be big endian..
+ *
+ * @return true if the platform is little endian.
+ */
+ public boolean isLittleEndian();
+
+ /**
+ * Answers the platform pointer size.
+ *
+ * @return the native platform pointer size, in bytes.
+ */
+ public int getPointerSize();
+
+ /**
+ * Allocates and returns a pointer to space for a memory block of
+ * <code>length</code> bytes. The space is uninitialized and may be larger
+ * than the number of bytes requested; however, the guaranteed usable memory
+ * block is exactly <code>length</code> bytes long.
+ *
+ * @param length
+ * number of bytes requested.
+ * @return the address of the start of the memory block.
+ * @throws OutOfMemoryError
+ * if the request cannot be satisfied.
+ */
+ public long malloc(long length) throws OutOfMemoryError;
+
+ /**
+ * Deallocates space for a memory block that was previously allocated by a
+ * call to {@link #malloc(long) malloc(long)}. The number of bytes freed is
+ * identical to the number of bytes acquired when the memory block was
+ * allocated. If <code>address</code> is zero the method does nothing.
+ * <p>
+ * Freeing a pointer to a memory block that was not allocated by
+ * <code>malloc()</code> has unspecified effect.
+ * </p>
+ *
+ * @param address
+ * the address of the memory block to deallocate.
+ */
+ public void free(long address);
+
+ /**
+ * Places <code>value</code> into first <code>length</code> bytes of the
+ * memory block starting at <code>address</code>.
+ * <p>
+ * The behavior is unspecified if
+ * <code>(address ... address + length)</code> is not wholly within the
+ * range that was previously allocated using <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the address of the first memory location.
+ * @param value
+ * the byte value to set at each location.
+ * @param length
+ * the number of byte-length locations to set.
+ */
+ public void memset(long address, byte value, long length);
+
+ /**
+ * Copies <code>length</code> bytes from <code>srcAddress</code> to
+ * <code>destAddress</code>. Where any part of the source memory block
+ * and the destination memory block overlap <code>memmove()</code> ensures
+ * that the original source bytes in the overlapping region are copied
+ * before being overwritten.
+ * <p>
+ * The behavior is unspecified if
+ * <code>(srcAddress ... srcAddress + length)</code> and
+ * <code>(destAddress ... destAddress + length)</code> are not both wholly
+ * within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param destAddress
+ * the address of the destination memory block.
+ * @param srcAddress
+ * the address of the source memory block.
+ * @param length
+ * the number of bytes to move.
+ */
+ public void memmove(long destAddress, long srcAddress, long length);
+
+ /**
+ * Copies <code>length</code> bytes from the memory block at
+ * <code>address</code> into the byte array <code>bytes</code> starting
+ * at element <code>offset</code> within the byte array.
+ * <p>
+ * The behavior of this method is undefined if the range
+ * <code>(address ... address + length)</code> is not within a memory
+ * block that was allocated using {@link #malloc(long) malloc(long)}.
+ * </p>
+ *
+ * @param address
+ * the address of the OS memory block from which to copy bytes.
+ * @param bytes
+ * the byte array into which to copy the bytes.
+ * @param offset
+ * the index of the first element in <code>bytes</code> that
+ * will be overwritten.
+ * @param length
+ * the total number of bytes to copy into the byte array.
+ * @throws NullPointerException
+ * if <code>bytes</code> is <code>null</code>.
+ * @throws IndexOutOfBoundsException
+ * if <code>offset + length > bytes.length</code>.
+ */
+ public void getByteArray(long address, byte[] bytes, int offset, int length)
+ throws NullPointerException, IndexOutOfBoundsException;
+
+ /**
+ * Copies <code>length</code> bytes from the byte array <code>bytes</code>
+ * into the memory block at <code>address</code>, starting at element
+ * <code>offset</code> within the byte array.
+ * <p>
+ * The behavior of this method is undefined if the range
+ * <code>(address ... address + length)</code> is not within a memory
+ * block that was allocated using {@link #malloc(long) malloc(long)}.
+ * </p>
+ *
+ * @param address
+ * the address of the OS memory block into which to copy the
+ * bytes.
+ * @param bytes
+ * the byte array from which to copy the bytes.
+ * @param offset
+ * the index of the first element in <code>bytes</code> that
+ * will be read.
+ * @param length
+ * the total number of bytes to copy from <code>bytes</code>
+ * into the memory block.
+ * @throws NullPointerException
+ * if <code>bytes</code> is <code>null</code>.
+ * @throws IndexOutOfBoundsException
+ * if <code>offset + length > bytes.length</code>.
+ */
+ public void setByteArray(long address, byte[] bytes, int offset, int length)
+ throws NullPointerException, IndexOutOfBoundsException;
/**
* Returns the value of a single byte at the given address.
@@ -196,36 +196,36 @@
* the address at which to get the byte value.
* @return the value of the byte.
*/
- public byte getByte(long address);
+ public byte getByte(long address);
- /**
- * Sets the given single byte value at the given address.
- * <p>
- * The behavior is unspecified if <code>address</code> is not in the range
- * that was previously allocated using <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the address at which to set the byte value.
- * @param value
- * the value to set.
- */
- public void setByte(long address, byte value);
-
- /**
- * Gets the value of the signed two-byte integer stored in platform byte
- * order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 2)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the two-byte value.
- * @return the value of the two-byte integer as a Java <code>short</code>.
- */
- public short getShort(long address);
+ /**
+ * Sets the given single byte value at the given address.
+ * <p>
+ * The behavior is unspecified if <code>address</code> is not in the range
+ * that was previously allocated using <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the address at which to set the byte value.
+ * @param value
+ * the value to set.
+ */
+ public void setByte(long address, byte value);
+
+ /**
+ * Gets the value of the signed two-byte integer stored in platform byte
+ * order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 2)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the two-byte value.
+ * @return the value of the two-byte integer as a Java <code>short</code>.
+ */
+ public short getShort(long address);
/**
* Gets the value of the signed two-byte integer stored in the given byte
@@ -242,205 +242,205 @@
* the required interpretation of the short endianness.
* @return the value of the two-byte integer as a Java <code>short</code>.
*/
- public short getShort(long address, Endianness endianness);
+ public short getShort(long address, Endianness endianness);
+
+ /**
+ * Sets the value of the signed two-byte integer at the given address in
+ * platform byte order.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 2)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the two-byte value.
+ * @param value
+ * the value of the two-byte integer as a Java <code>short</code>.
+ */
+ public void setShort(long address, short value);
+
+ public void setShort(long address, short value, Endianness endianness);
+
+ /**
+ * Gets the value of the signed four-byte integer stored in platform
+ * byte-order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 4)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the four-byte value.
+ * @return the value of the four-byte integer as a Java <code>int</code>.
+ */
+ public int getInt(long address);
- /**
- * Sets the value of the signed two-byte integer at the given address in
- * platform byte order.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 2)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the two-byte value.
- * @param value
- * the value of the two-byte integer as a Java <code>short</code>.
- */
- public void setShort(long address, short value);
-
- public void setShort(long address, short value, Endianness endianness);
-
- /**
- * Gets the value of the signed four-byte integer stored in platform
- * byte-order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 4)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the four-byte value.
- * @return the value of the four-byte integer as a Java <code>int</code>.
- */
- public int getInt(long address);
-
- public int getInt(long address, Endianness endianness);
-
- /**
- * Sets the value of the signed four-byte integer at the given address in
- * platform byte order.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 4)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the four-byte value.
- * @param value
- * the value of the four-byte integer as a Java <code>int</code>.
- */
- public void setInt(long address, int value);
-
- public void setInt(long address, int value, Endianness endianness);
-
- /**
- * Gets the value of the signed eight-byte integer stored in platform byte
- * order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 8)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the eight-byte value.
- * @return the value of the eight-byte integer as a Java <code>long</code>.
- */
- public long getLong(long address);
-
- public long getLong(long address, Endianness endianness);
-
- /**
- * Sets the value of the signed eight-byte integer at the given address in
- * the platform byte order.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 8)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the eight-byte value.
- * @param value
- * the value of the eight-byte integer as a Java
- * <code>long</code>.
- */
- public void setLong(long address, long value);
-
- public void setLong(long address, long value, Endianness endianness);
-
- /**
- * Gets the value of the IEEE754-format four-byte float stored in platform
- * byte order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 4)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the eight-byte value.
- * @return the value of the four-byte float as a Java <code>float</code>.
- */
- public float getFloat(long address);
-
- public float getFloat(long address, Endianness endianness);
-
- /**
- * Sets the value of the IEEE754-format four-byte float stored in platform
- * byte order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 4)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the eight-byte value.
- * @param value
- * the value of the four-byte float as a Java <code>float</code>.
- */
- public void setFloat(long address, float value);
-
- public void setFloat(long address, float value, Endianness endianness);
-
- /**
- * Gets the value of the IEEE754-format eight-byte float stored in platform
- * byte order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 8)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the eight-byte value.
- * @return the value of the eight-byte float as a Java <code>double</code>.
- */
- public double getDouble(long address);
-
- public double getDouble(long address, Endianness endianness);
-
- /**
- * Sets the value of the IEEE754-format eight-byte float store in platform
- * byte order at the given address.
- * <p>
- * The behavior is unspecified if <code>(address ... address + 8)</code>
- * is not wholly within the range that was previously allocated using
- * <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the eight-byte value.
- * @param value
- * the value of the eight-byte float as a Java
- * <code>double</code>.
- */
- public void setDouble(long address, double value);
-
- public void setDouble(long address, double value, Endianness endianness);
-
- /**
- * Gets the value of the platform pointer at the given address.
- * <p>
- * The length of the platform pointer is defined by
- * <code>POINTER_SIZE</code>.
- * </p>
- * The behavior is unspecified if
- * <code>(address ... address + POINTER_SIZE)</code> is not wholly within
- * the range that was previously allocated using <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the platform pointer.
- * @return the value of the platform pointer as a Java <code>long</code>.
- */
- public long getAddress(long address);
-
- /**
- * Sets the value of the platform pointer at the given address.
- * <p>
- * The length of the platform pointer is defined by
- * <code>POINTER_SIZE</code>. This method only sets
- * <code>POINTER_SIZE</code> bytes at the given address.
- * </p>
- * The behavior is unspecified if
- * <code>(address ... address + POINTER_SIZE)</code> is not wholly within
- * the range that was previously allocated using <code>malloc()</code>.
- * </p>
- *
- * @param address
- * the platform address of the start of the platform pointer.
- * @param value
- * the value of the platform pointer as a Java <code>long</code>.
- */
- public void setAddress(long address, long value);
+ public int getInt(long address, Endianness endianness);
- /**
+ /**
+ * Sets the value of the signed four-byte integer at the given address in
+ * platform byte order.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 4)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the four-byte value.
+ * @param value
+ * the value of the four-byte integer as a Java <code>int</code>.
+ */
+ public void setInt(long address, int value);
+
+ public void setInt(long address, int value, Endianness endianness);
+
+ /**
+ * Gets the value of the signed eight-byte integer stored in platform byte
+ * order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 8)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the eight-byte value.
+ * @return the value of the eight-byte integer as a Java <code>long</code>.
+ */
+ public long getLong(long address);
+
+ public long getLong(long address, Endianness endianness);
+
+ /**
+ * Sets the value of the signed eight-byte integer at the given address in
+ * the platform byte order.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 8)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the eight-byte value.
+ * @param value
+ * the value of the eight-byte integer as a Java
+ * <code>long</code>.
+ */
+ public void setLong(long address, long value);
+
+ public void setLong(long address, long value, Endianness endianness);
+
+ /**
+ * Gets the value of the IEEE754-format four-byte float stored in platform
+ * byte order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 4)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the eight-byte value.
+ * @return the value of the four-byte float as a Java <code>float</code>.
+ */
+ public float getFloat(long address);
+
+ public float getFloat(long address, Endianness endianness);
+
+ /**
+ * Sets the value of the IEEE754-format four-byte float stored in platform
+ * byte order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 4)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the eight-byte value.
+ * @param value
+ * the value of the four-byte float as a Java <code>float</code>.
+ */
+ public void setFloat(long address, float value);
+
+ public void setFloat(long address, float value, Endianness endianness);
+
+ /**
+ * Gets the value of the IEEE754-format eight-byte float stored in platform
+ * byte order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 8)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the eight-byte value.
+ * @return the value of the eight-byte float as a Java <code>double</code>.
+ */
+ public double getDouble(long address);
+
+ public double getDouble(long address, Endianness endianness);
+
+ /**
+ * Sets the value of the IEEE754-format eight-byte float store in platform
+ * byte order at the given address.
+ * <p>
+ * The behavior is unspecified if <code>(address ... address + 8)</code>
+ * is not wholly within the range that was previously allocated using
+ * <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the eight-byte value.
+ * @param value
+ * the value of the eight-byte float as a Java
+ * <code>double</code>.
+ */
+ public void setDouble(long address, double value);
+
+ public void setDouble(long address, double value, Endianness endianness);
+
+ /**
+ * Gets the value of the platform pointer at the given address.
+ * <p>
+ * The length of the platform pointer is defined by
+ * <code>POINTER_SIZE</code>.
+ * </p>
+ * The behavior is unspecified if
+ * <code>(address ... address + POINTER_SIZE)</code> is not wholly within
+ * the range that was previously allocated using <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the platform pointer.
+ * @return the value of the platform pointer as a Java <code>long</code>.
+ */
+ public long getAddress(long address);
+
+ /**
+ * Sets the value of the platform pointer at the given address.
+ * <p>
+ * The length of the platform pointer is defined by
+ * <code>POINTER_SIZE</code>. This method only sets
+ * <code>POINTER_SIZE</code> bytes at the given address.
+ * </p>
+ * The behavior is unspecified if
+ * <code>(address ... address + POINTER_SIZE)</code> is not wholly within
+ * the range that was previously allocated using <code>malloc()</code>.
+ * </p>
+ *
+ * @param address
+ * the platform address of the start of the platform pointer.
+ * @param value
+ * the value of the platform pointer as a Java <code>long</code>.
+ */
+ public void setAddress(long address, long value);
+
+ /**
* Map file content into memory.
*
* @param fileDescriptor
@@ -461,27 +461,27 @@
public long mmap(long fileDescriptor, long alignment, long size, int mapMode)
throws IOException;
- /**
- * TODO: JavaDoc
- *
- * @param addr
- * @throws IOException
- */
- public void unmap(long addr, long size);
-
- /**
- * TODO: JavaDoc
- */
- public void load(long addr, long size);
-
- /**
- * TODO: JavaDoc
- */
- public boolean isLoaded(long addr, long size);
-
- /**
- * TODO : JavaDoc
- */
- public void flush(long addr, long size);
+ /**
+ * TODO: JavaDoc
+ *
+ * @param addr
+ * @throws IOException
+ */
+ public void unmap(long addr, long size);
+
+ /**
+ * TODO: JavaDoc
+ */
+ public void load(long addr, long size);
+
+ /**
+ * TODO: JavaDoc
+ */
+ public boolean isLoaded(long addr, long size);
+
+ /**
+ * TODO : JavaDoc
+ */
+ public void flush(long addr, long size);
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java Mon Oct 12 00:55:27 2009
@@ -31,33 +31,33 @@
*/
public interface INetworkSystem {
- /*
- * Socket connect Step start
- */
- public final int SOCKET_CONNECT_STEP_START = 0;
-
- /*
- * Socket connect Step check
- */
- public final int SOCKET_CONNECT_STEP_CHECK = 1;
-
- /*
- * socket accept
- */
- public void accept(FileDescriptor fdServer, SocketImpl newSocket,
- FileDescriptor fdnewSocket, int timeout) throws IOException;
+ /*
+ * Socket connect Step start
+ */
+ public final int SOCKET_CONNECT_STEP_START = 0;
+
+ /*
+ * Socket connect Step check
+ */
+ public final int SOCKET_CONNECT_STEP_CHECK = 1;
+
+ /*
+ * socket accept
+ */
+ public void accept(FileDescriptor fdServer, SocketImpl newSocket,
+ FileDescriptor fdnewSocket, int timeout) throws IOException;
- public void bind(FileDescriptor aFD, InetAddress inetAddress, int port)
- throws SocketException;
+ public void bind(FileDescriptor aFD, InetAddress inetAddress, int port)
+ throws SocketException;
- public int read(FileDescriptor aFD, byte[] data, int offset, int count,
- int timeout) throws IOException;
+ public int read(FileDescriptor aFD, byte[] data, int offset, int count,
+ int timeout) throws IOException;
public int readDirect(FileDescriptor aFD, long address, int count,
int timeout) throws IOException;
- public int write(FileDescriptor fd, byte[] data, int offset, int count)
- throws IOException;
+ public int write(FileDescriptor fd, byte[] data, int offset, int count)
+ throws IOException;
public int writeDirect(FileDescriptor fd, long address, int count)
throws IOException;
@@ -65,152 +65,152 @@
public int writev(FileDescriptor fd, Object[] buffers, int[] offsets,
int[] counts, int length) throws IOException;
- public void setNonBlocking(FileDescriptor aFD, boolean block)
- throws IOException;
+ public void setNonBlocking(FileDescriptor aFD, boolean block)
+ throws IOException;
+
+ public int connect(FileDescriptor aFD, int trafficClass,
+ InetAddress inetAddress, int port) throws IOException;
- public int connect(FileDescriptor aFD, int trafficClass,
- InetAddress inetAddress, int port) throws IOException;
+ public int connectWithTimeout(FileDescriptor aFD, int timeout,
+ int trafficClass, InetAddress hostname, int port, int step,
+ Long context) throws IOException;
- public int connectWithTimeout(FileDescriptor aFD, int timeout,
- int trafficClass, InetAddress hostname, int port, int step,
- Long context) throws IOException;
-
- public int sendDatagram(FileDescriptor fd, byte[] data, int offset,
- int length, int port, boolean bindToDevice, int trafficClass,
- InetAddress inetAddress) throws IOException;
+ public int sendDatagram(FileDescriptor fd, byte[] data, int offset,
+ int length, int port, boolean bindToDevice, int trafficClass,
+ InetAddress inetAddress) throws IOException;
public int sendDatagramDirect(FileDescriptor fd, long address, int offset,
int length, int port, boolean bindToDevice, int trafficClass,
InetAddress inetAddress) throws IOException;
- public int receiveDatagram(FileDescriptor aFD, DatagramPacket packet,
- byte[] data, int offset, int length, int receiveTimeout,
- boolean peek) throws IOException;
+ public int receiveDatagram(FileDescriptor aFD, DatagramPacket packet,
+ byte[] data, int offset, int length, int receiveTimeout,
+ boolean peek) throws IOException;
public int receiveDatagramDirect(FileDescriptor aFD, DatagramPacket packet,
long address, int offset, int length, int receiveTimeout,
boolean peek) throws IOException;
- public int recvConnectedDatagram(FileDescriptor aFD, DatagramPacket packet,
- byte[] data, int offset, int length, int receiveTimeout,
- boolean peek) throws IOException;
+ public int recvConnectedDatagram(FileDescriptor aFD, DatagramPacket packet,
+ byte[] data, int offset, int length, int receiveTimeout,
+ boolean peek) throws IOException;
public int recvConnectedDatagramDirect(FileDescriptor aFD,
DatagramPacket packet, long address, int offset, int length,
int receiveTimeout, boolean peek) throws IOException;
- public int peekDatagram(FileDescriptor aFD, InetAddress sender,
- int receiveTimeout) throws IOException;
+ public int peekDatagram(FileDescriptor aFD, InetAddress sender,
+ int receiveTimeout) throws IOException;
- public int sendConnectedDatagram(FileDescriptor fd, byte[] data,
- int offset, int length, boolean bindToDevice) throws IOException;
+ public int sendConnectedDatagram(FileDescriptor fd, byte[] data,
+ int offset, int length, boolean bindToDevice) throws IOException;
public int sendConnectedDatagramDirect(FileDescriptor fd, long address,
int offset, int length, boolean bindToDevice) throws IOException;
- public void disconnectDatagram(FileDescriptor aFD) throws SocketException;
+ public void disconnectDatagram(FileDescriptor aFD) throws SocketException;
- public void createDatagramSocket(FileDescriptor aFD, boolean preferIPv4Stack)
- throws SocketException;
+ public void createDatagramSocket(FileDescriptor aFD, boolean preferIPv4Stack)
+ throws SocketException;
- public void connectDatagram(FileDescriptor aFD, int port, int trafficClass,
- InetAddress inetAddress) throws SocketException;
+ public void connectDatagram(FileDescriptor aFD, int port, int trafficClass,
+ InetAddress inetAddress) throws SocketException;
- /**
- * @deprecated Use {@link #read(FileDescriptor, byte[], int, int, int)}
- */
- @Deprecated
- public int receiveStream(FileDescriptor aFD, byte[] data, int offset,
- int count, int timeout) throws IOException;
+ /**
+ * @deprecated Use {@link #read(FileDescriptor, byte[], int, int, int)}
+ */
+ @Deprecated
+ public int receiveStream(FileDescriptor aFD, byte[] data, int offset,
+ int count, int timeout) throws IOException;
- public void shutdownInput(FileDescriptor descriptor) throws IOException;
+ public void shutdownInput(FileDescriptor descriptor) throws IOException;
- public void shutdownOutput(FileDescriptor descriptor) throws IOException;
+ public void shutdownOutput(FileDescriptor descriptor) throws IOException;
- public boolean supportsUrgentData(FileDescriptor fd);
+ public boolean supportsUrgentData(FileDescriptor fd);
- public void sendUrgentData(FileDescriptor fd, byte value);
+ public void sendUrgentData(FileDescriptor fd, byte value);
- public int availableStream(FileDescriptor aFD) throws SocketException;
+ public int availableStream(FileDescriptor aFD) throws SocketException;
- public void acceptStreamSocket(FileDescriptor fdServer,
- SocketImpl newSocket, FileDescriptor fdnewSocket, int timeout)
- throws IOException;
+ public void acceptStreamSocket(FileDescriptor fdServer,
+ SocketImpl newSocket, FileDescriptor fdnewSocket, int timeout)
+ throws IOException;
- public void createServerStreamSocket(FileDescriptor aFD, boolean preferIPv4Stack)
+ public void createServerStreamSocket(FileDescriptor aFD, boolean preferIPv4Stack)
throws SocketException;
public void createStreamSocket(FileDescriptor aFD, boolean preferIPv4Stack)
throws SocketException;
- public void listenStreamSocket(FileDescriptor aFD, int backlog)
- throws SocketException;
+ public void listenStreamSocket(FileDescriptor aFD, int backlog)
+ throws SocketException;
- public void connectStreamWithTimeoutSocket(FileDescriptor aFD, int aport,
- int timeout, int trafficClass, InetAddress inetAddress)
- throws IOException;
+ public void connectStreamWithTimeoutSocket(FileDescriptor aFD, int aport,
+ int timeout, int trafficClass, InetAddress inetAddress)
+ throws IOException;
- public int sendDatagram2(FileDescriptor fd, byte[] data, int offset,
- int length, int port, InetAddress inetAddress) throws IOException;
+ public int sendDatagram2(FileDescriptor fd, byte[] data, int offset,
+ int length, int port, InetAddress inetAddress) throws IOException;
- public InetAddress getSocketLocalAddress(FileDescriptor aFD,
- boolean preferIPv6Addresses);
+ public InetAddress getSocketLocalAddress(FileDescriptor aFD,
+ boolean preferIPv6Addresses);
public int[] select(FileDescriptor[] readFDs,
FileDescriptor[] writeFDs, long timeout)
throws SocketException;
- /*
- * Query the IP stack for the local port to which this socket is bound.
- *
- * @param aFD the socket descriptor @param preferIPv6Addresses address
- * preference for nodes that support both IPv4 and IPv6 @return int the
- * local port to which the socket is bound
- */
- public int getSocketLocalPort(FileDescriptor aFD,
- boolean preferIPv6Addresses);
-
- /*
- * Query the IP stack for the nominated socket option.
- *
- * @param aFD the socket descriptor @param opt the socket option type
- * @return the nominated socket option value
- *
- * @throws SocketException if the option is invalid
- */
- public Object getSocketOption(FileDescriptor aFD, int opt)
- throws SocketException;
-
- /*
- * Set the nominated socket option in the IP stack.
- *
- * @param aFD the socket descriptor @param opt the option selector @param
- * optVal the nominated option value
- *
- * @throws SocketException if the option is invalid or cannot be set
- */
- public void setSocketOption(FileDescriptor aFD, int opt, Object optVal)
- throws SocketException;
-
- public int getSocketFlags();
-
- /*
- * Close the socket in the IP stack.
- *
- * @param aFD the socket descriptor
- */
- public void socketClose(FileDescriptor aFD) throws IOException;
-
- public InetAddress getHostByAddr(byte[] addr) throws UnknownHostException;
-
- public InetAddress getHostByName(String addr, boolean preferIPv6Addresses)
- throws UnknownHostException;
-
- public void setInetAddress(InetAddress sender, byte[] address);
-
- public boolean isReachableByICMP(InetAddress dest,InetAddress source,int ttl,int timeout);
-
- public Channel inheritedChannel();
+ /*
+ * Query the IP stack for the local port to which this socket is bound.
+ *
+ * @param aFD the socket descriptor @param preferIPv6Addresses address
+ * preference for nodes that support both IPv4 and IPv6 @return int the
+ * local port to which the socket is bound
+ */
+ public int getSocketLocalPort(FileDescriptor aFD,
+ boolean preferIPv6Addresses);
+
+ /*
+ * Query the IP stack for the nominated socket option.
+ *
+ * @param aFD the socket descriptor @param opt the socket option type
+ * @return the nominated socket option value
+ *
+ * @throws SocketException if the option is invalid
+ */
+ public Object getSocketOption(FileDescriptor aFD, int opt)
+ throws SocketException;
+
+ /*
+ * Set the nominated socket option in the IP stack.
+ *
+ * @param aFD the socket descriptor @param opt the option selector @param
+ * optVal the nominated option value
+ *
+ * @throws SocketException if the option is invalid or cannot be set
+ */
+ public void setSocketOption(FileDescriptor aFD, int opt, Object optVal)
+ throws SocketException;
+
+ public int getSocketFlags();
+
+ /*
+ * Close the socket in the IP stack.
+ *
+ * @param aFD the socket descriptor
+ */
+ public void socketClose(FileDescriptor aFD) throws IOException;
+
+ public InetAddress getHostByAddr(byte[] addr) throws UnknownHostException;
+
+ public InetAddress getHostByName(String addr, boolean preferIPv6Addresses)
+ throws UnknownHostException;
+
+ public void setInetAddress(InetAddress sender, byte[] address);
+
+ public boolean isReachableByICMP(InetAddress dest,InetAddress source,int ttl,int timeout);
+
+ public Channel inheritedChannel();
public void oneTimeInitialization(boolean jcl_supports_ipv6);
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java?rev=824209&r1=824208&r2=824209&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java Mon Oct 12 00:55:27 2009
@@ -19,9 +19,9 @@
public interface IPlatformConstants {
- public static final int NULL = 0;
+ public static final int NULL = 0;
- public static final byte TRUE = 1;
+ public static final byte TRUE = 1;
- public static final byte FALSE = 0;
+ public static final byte FALSE = 0;
}