harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r645519 - in /harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp: common/transport/common/ unix/transport/common/ unix/transport/dt_socket/ windows/transport/common/ windows/transport/dt_shmem/ windows/transport/dt_socket/
Date Mon, 07 Apr 2008 13:46:57 GMT
Author: odeakin
Date: Mon Apr  7 06:46:55 2008
New Revision: 645519

URL: http://svn.apache.org/viewvc?rev=645519&view=rev
Log:
Separate transport error handling code from socket transport implementation.

Added:
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
  (with props)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
  (with props)
Modified:
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.cpp
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.h
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.cpp?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.cpp
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.cpp
Mon Apr  7 06:46:55 2008
@@ -20,7 +20,7 @@
  * @author Viacheslav G. Rybalov
  * @version $Revision: 1.6 $
  */
-#include "SocketTransport_pd.h"
+#include "LastTransportError.h"
 
 void (*LastTransportError::m_free)(void *buffer) = 0;
 

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.h?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.h
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.h
Mon Apr  7 06:46:55 2008
@@ -30,6 +30,9 @@
 #ifndef _LASTTRANSPORTERROR_H
 #define _LASTTRANSPORTERROR_H
 
+#include "jdwpTransport.h"
+#include "LastTransportError_pd.h"
+
 /**
  * The given class is a container for message and status code of the last 
  * transport error.

Added: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h?rev=645519&view=auto
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
(added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
Mon Apr  7 06:46:55 2008
@@ -0,0 +1,39 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _LASTTRANSPORTERROR_PD_H
+#define _LASTTRANSPORTERROR_PD_H
+
+#include <pthread.h>
+#include <string.h>
+
+typedef pthread_t ThreadId_t;
+
+static inline bool 
+ThreadId_equal(ThreadId_t treadId1, ThreadId_t treadId2)
+{
+    return pthread_equal(treadId1, treadId2) != 0 ? true : false;
+} // ThreadId_equal()
+
+static inline ThreadId_t 
+GetCurrentThreadId()
+{
+    return pthread_self();
+} // GetCurrentThreadId()
+
+#endif // _LASTTRANSPORTERROR_PD_H

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h
Mon Apr  7 06:46:55 2008
@@ -50,7 +50,6 @@
 
 typedef pthread_mutex_t CriticalSection;
 typedef int SOCKET;
-typedef pthread_t ThreadId_t;
 
 #include "jdwpTransport.h"
 #include "LastTransportError.h"
@@ -160,17 +159,5 @@
 {
     pthread_mutex_unlock(&(((internalEnv*)env->functions->reserved1)->sendLock));
 }
-
-static inline ThreadId_t 
-GetCurrentThreadId()
-{
-    return pthread_self();
-} // GetCurrentThreadId()
-
-static inline bool 
-ThreadId_equal(ThreadId_t treadId1, ThreadId_t treadId2)
-{
-    return pthread_equal(treadId1, treadId2) != 0 ? true : false;
-} // ThreadId_equal()
 
 #endif //_SOCKETTRANSPORT_PD_H

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
Mon Apr  7 06:46:55 2008
@@ -30,7 +30,8 @@
 CXXFLAGS += -fpic
 
 INCLUDES += -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
-            -I$(COMMON)generic -I.
+            -I$(COMMON)generic -I. \
+            -I../common
 
 LDFLAGS += -lstdc++
 

Added: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h?rev=645519&view=auto
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
(added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
Mon Apr  7 06:46:55 2008
@@ -0,0 +1,31 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _LASTTRANSPORTERROR_PD_H
+#define _LASTTRANSPORTERROR_PD_H
+
+#include <windows.h>
+
+typedef DWORD ThreadId_t;
+
+static inline bool ThreadId_equal(ThreadId_t treadId1, ThreadId_t treadId2)
+{
+    return (treadId1 == treadId2);
+} // ThreadId_equal()
+
+#endif // _LASTTRANSPORTERROR_PD_H

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h
Mon Apr  7 06:46:55 2008
@@ -25,9 +25,6 @@
 
 #include <windows.h>
 
-typedef CRITICAL_SECTION CriticalSection;
-typedef DWORD ThreadId_t;
-
 #include "jni.h"
 #include "jdwpTransport.h"
 #include "LastTransportError.h"

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
Mon Apr  7 06:46:55 2008
@@ -28,7 +28,8 @@
 
 INCLUDES = $(INCLUDES) \
          -I$(CMNTRANS)common \
-         -I$(COMMON)generic -I.
+         -I$(COMMON)generic -I. \
+         -I..\common
 
 HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -wd4290
 

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
Mon Apr  7 06:46:55 2008
@@ -40,7 +40,6 @@
 #include <Ws2tcpip.h>
 
 typedef CRITICAL_SECTION CriticalSection;
-typedef DWORD ThreadId_t;
 
 #include "jdwpTransport.h"
 #include "LastTransportError.h"
@@ -115,10 +114,5 @@
 {
     LeaveCriticalSection(&(((internalEnv*)env->functions->reserved1)->sendLock));
 } //LeaveCriticalSendSection()
-
-static inline bool ThreadId_equal(ThreadId_t treadId1, ThreadId_t treadId2)
-{
-    return (treadId1 == treadId2);
-} // ThreadId_equal()
 
 #endif // _SOCKETTRANSPORT_PD_H

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile?rev=645519&r1=645518&r2=645519&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
Mon Apr  7 06:46:55 2008
@@ -28,7 +28,8 @@
 
 INCLUDES = $(INCLUDES) \
          -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
-         -I$(COMMON)generic -I.
+         -I$(COMMON)generic -I. \
+         -I..\common
 
 HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -wd4290
 



Mime
View raw message