harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r383845 [1/3] - in /incubator/harmony/enhanced/classlib/trunk: modules/luni/src/main/java/com/ibm/platform/ modules/luni/src/main/java/com/ibm/platform/struct/ modules/nio/src/main/java/com/ibm/platform/ modules/nio/src/main/java/com/ibm/pl...
Date Tue, 07 Mar 2006 11:29:21 GMT
Author: tellison
Date: Tue Mar  7 03:29:14 2006
New Revision: 383845

URL: http://svn.apache.org/viewcvs?rev=383845&view=rev
Log:
Part One of HARMONY-92 (Suggestion: Move com.ibm.platform from NIO to LUNI)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/AdapterManager.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/AdapterManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Endianness.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/Endianness.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/FileDescriptorHandler.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/FileDescriptorHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdaptable.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IAdaptable.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterFactory.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IAdapterFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterManager.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IAdapterManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IFileSystem.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IFileSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IMemorySystem.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IMemorySystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/INetworkSystem.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/INetworkSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/ISystemComponent.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/ISystemComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponent.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponentFactory.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSComponentFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSFileSystem.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSFileSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSMemory.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSMemory.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSNetworkSystem.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSNetworkSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Platform.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/Platform.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IMemorySpy.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/IMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IPlatformConstants.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/IPlatformConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/PlatformAddress.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/PlatformAddress.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/IFileSystem.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/IFileSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c
      - copied, changed from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSFileSystemLinux32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.c
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSMemory.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSMemory.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemoryLinux32.c
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSMemoryLinux32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystem.c
      - copied, changed from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSNetworkSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/IMemorySystem.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/IMemorySystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSFileSystem.c
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/OSFileSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSFileSystem.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/OSFileSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/OSNetworkSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/socket.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/socket.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/IFileSystem.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSFileSystemWin32.c
      - copied, changed from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSFileSystemWin32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSMemory.c
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSMemory.h
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSMemoryWin32.c
      - copied unchanged from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemoryWin32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystem.c
      - copied, changed from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSNetworkSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c
      - copied, changed from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSNetworkSystemWin32.c
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/AdapterManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/Endianness.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/FileDescriptorHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IAdaptable.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IAdapterFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IAdapterManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IFileSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/IMemorySystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/INetworkSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/ISystemComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSComponentFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSFileSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSMemory.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/OSNetworkSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/Platform.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/IMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/IPlatformConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/PlatformAddress.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/IFileSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSFileSystemLinux32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSMemory.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSMemory.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSMemoryLinux32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSNetworkSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/IMemorySystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/OSFileSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/OSFileSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/OSNetworkSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/socket.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSFileSystemWin32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemoryWin32.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSNetworkSystem.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSNetworkSystemWin32.c
Modified:
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/nethelp.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/libhynio.exp
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/nethelp.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/hynio.def
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile

Copied: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c
(from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSFileSystemLinux32.c)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c?p2=incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c&p1=incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSFileSystemLinux32.c&r1=383844&r2=383845&rev=383845&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSFileSystemLinux32.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c
Tue Mar  7 03:29:14 2006
@@ -222,13 +222,14 @@
 JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSFileSystem_transferImpl
   (JNIEnv *env, jobject thiz, jlong fd, jobject sd, jlong offset, jlong count)
 {
-	PORT_ACCESS_FROM_ENV (env);
-	int socket;
-	//TODO IPV6
-	hysocket_t hysocketP= (hysocket_t)getJavaIoFileDescriptorContentsAsAPointer (env,sd);
-	if(hysocketP == NULL)
-       return -1;
-	socket = hysocketP->sock;
-	return sendfile(socket,(size_t)fd,(off_t *)&offset,(size_t)count);	
+  PORT_ACCESS_FROM_ENV (env);
+  int socket;
+  //TODO IPV6
+  hysocket_t hysocketP =
+    (hysocket_t)getJavaIoFileDescriptorContentsAsPointer (env,sd);
+  if(hysocketP == NULL)
+    return -1;
+  socket = hysocketP->sock;
+  return sendfile(socket,(size_t)fd,(off_t *)&offset,(size_t)count);	
 }
 



Mime
View raw message