src/java.base/solaris/native/libnio/ch/SolarisEventPort.c

rev 49271 : [mq]: selector-cleanup

*** 1,7 ****
  /*
!  * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 21,41 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #include "jni.h"
  #include "jni_util.h"
  #include "jvm.h"
  #include "jlong.h"
  #include "nio_util.h"
  
- #include <stdlib.h>
- #include <dlfcn.h>
- #include <sys/types.h>
- #include <port.h>
- 
  #include "sun_nio_ch_SolarisEventPort.h"
  
  JNIEXPORT jint JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1create
      (JNIEnv* env, jclass clazz)
--- 21,42 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
+ #include <stdlib.h>
+ #include <dlfcn.h>
+ #include <sys/types.h>
+ #include <port.h>
+ 
  #include "jni.h"
  #include "jni_util.h"
  #include "jvm.h"
  #include "jlong.h"
+ #include "nio.h"
  #include "nio_util.h"
  
  #include "sun_nio_ch_SolarisEventPort.h"
  
  JNIEXPORT jint JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1create
      (JNIEnv* env, jclass clazz)
*** 49,60 ****
  
  JNIEXPORT void JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1close
      (JNIEnv* env, jclass clazz, jint port)
  {
!     int res;
!     RESTARTABLE(close(port), res);
  }
  
  JNIEXPORT jboolean JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1associate
      (JNIEnv* env, jclass clazz, jint port, jint source, jlong objectAddress, jint events)
--- 50,63 ----
  
  JNIEXPORT void JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1close
      (JNIEnv* env, jclass clazz, jint port)
  {
!     int res = close(port);
!     if (res < 0 && res != EINTR) {
!         JNU_ThrowIOExceptionWithLastError(env, "close failed");
!     }
  }
  
  JNIEXPORT jboolean JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1associate
      (JNIEnv* env, jclass clazz, jint port, jint source, jlong objectAddress, jint events)
*** 91,111 ****
      if (port_send((int)port, (int)events, NULL) == -1) {
          JNU_ThrowIOExceptionWithLastError(env, "port_send");
      }
  }
  
! JNIEXPORT void JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1get(JNIEnv* env, jclass clazz,
      jint port, jlong eventAddress)
  {
      int res;
      port_event_t* ev = (port_event_t*)jlong_to_ptr(eventAddress);
  
!     RESTARTABLE(port_get((int)port, ev, NULL), res);
      if (res == -1) {
!         JNU_ThrowIOExceptionWithLastError(env, "port_get");
      }
  }
  
  JNIEXPORT jint JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1getn(JNIEnv* env, jclass clazz,
      jint port, jlong arrayAddress, jint max, jlong timeout)
--- 94,120 ----
      if (port_send((int)port, (int)events, NULL) == -1) {
          JNU_ThrowIOExceptionWithLastError(env, "port_send");
      }
  }
  
! JNIEXPORT jint JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1get(JNIEnv* env, jclass clazz,
      jint port, jlong eventAddress)
  {
      int res;
      port_event_t* ev = (port_event_t*)jlong_to_ptr(eventAddress);
  
!     res = port_get((int)port, ev, NULL);
      if (res == -1) {
!         if (errno == EINTR) {
!             return IOS_INTERRUPTED;
!         } else {
!             JNU_ThrowIOExceptionWithLastError(env, "port_get failed");
!             return IOS_THROWN;
          }
+     }
+     return res;
  }
  
  JNIEXPORT jint JNICALL
  Java_sun_nio_ch_SolarisEventPort_port_1getn(JNIEnv* env, jclass clazz,
      jint port, jlong arrayAddress, jint max, jlong timeout)
*** 123,134 ****
      } else {
          tsp = NULL;
      }
  
      res = port_getn((int)port, list, (uint_t)max, &n, tsp);
!     if (res == -1) {
!         if (errno != ETIME && errno != EINTR)
!             JNU_ThrowIOExceptionWithLastError(env, "port_getn");
      }
  
      return (jint)n;
  }
--- 132,147 ----
      } else {
          tsp = NULL;
      }
  
      res = port_getn((int)port, list, (uint_t)max, &n, tsp);
!     if (res == -1 && errno != ETIME) {
!         if (errno == EINTR) {
!             return IOS_INTERRUPTED;
!         } else {
!             JNU_ThrowIOExceptionWithLastError(env, "port_getn failed");
!             return IOS_THROWN;
!         }
      }
  
      return (jint)n;
  }