You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/06/29 07:55:56 UTC
svn commit: r789222 - in /commons/sandbox/runtime/trunk/src/main/native/os:
darwin/platform.c hpux/platform.c linux/platform.c solaris/platform.c
win32/platform.c
Author: mturk
Date: Mon Jun 29 05:55:55 2009
New Revision: 789222
URL: http://svn.apache.org/viewvc?rev=789222&view=rev
Log:
Init IOS for each platform
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/darwin/platform.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/platform.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/platform.c
commons/sandbox/runtime/trunk/src/main/native/os/solaris/platform.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c
Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/platform.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/platform.c?rev=789222&r1=789221&r2=789222&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/platform.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/platform.c Mon Jun 29 05:55:55 2009
@@ -19,10 +19,12 @@
#include "acr_arch.h"
#include "acr_string.h"
#include "acr_platform.h"
+#include "acr_error.h"
#include <locale.h>
#include <langinfo.h>
static const char unknown[] = "unknown";
+extern int acr_ioh_init(int);
acr_size_t acr_page_size;
int acr_native_codepage = ACR_CP_DEFAULT;
@@ -35,11 +37,19 @@
ACR_JNI_EXPORT_DECLARE(void, Platform, init0)(ACR_JNISTDARGS,
jintArray p)
{
+ int e;
jint ia[32];
UNREFERENCED_O;
(*_E)->GetIntArrayRegion(_E, p, 0, 16, &ia[0]);
+ if ((e = acr_ioh_init(ia[0]))) {
+ /* Error initializing descriptor map table.
+ * We cannot continue.
+ */
+ ACR_ThrowException(_E, THROW_NMARK, ACR_EX_OSERR, e);
+ return;
+ }
acr_native_codepage = ia[1];
ia[0] = sizeof(int);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/platform.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/platform.c?rev=789222&r1=789221&r2=789222&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/platform.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/platform.c Mon Jun 29 05:55:55 2009
@@ -19,10 +19,12 @@
#include "acr_arch.h"
#include "acr_string.h"
#include "acr_platform.h"
+#include "acr_error.h"
#include <locale.h>
#include <langinfo.h>
static const char unknown[] = "unknown";
+extern int acr_ioh_init(int);
acr_size_t acr_page_size;
int acr_native_codepage = ACR_CP_DEFAULT;
@@ -35,11 +37,19 @@
ACR_JNI_EXPORT_DECLARE(void, Platform, init0)(ACR_JNISTDARGS,
jintArray p)
{
+ int e;
jint ia[32];
UNREFERENCED_O;
(*_E)->GetIntArrayRegion(_E, p, 0, 16, &ia[0]);
+ if ((e = acr_ioh_init(ia[0]))) {
+ /* Error initializing descriptor map table.
+ * We cannot continue.
+ */
+ ACR_ThrowException(_E, THROW_NMARK, ACR_EX_OSERR, e);
+ return;
+ }
acr_native_codepage = ia[1];
ia[0] = sizeof(int);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/platform.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/platform.c?rev=789222&r1=789221&r2=789222&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/platform.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/platform.c Mon Jun 29 05:55:55 2009
@@ -19,10 +19,12 @@
#include "acr_arch.h"
#include "acr_string.h"
#include "acr_platform.h"
+#include "acr_error.h"
#include <locale.h>
#include <langinfo.h>
static const char unknown[] = "unknown";
+extern int acr_ioh_init(int);
acr_size_t acr_page_size;
int acr_native_codepage = ACR_CP_DEFAULT;
@@ -35,11 +37,19 @@
ACR_JNI_EXPORT_DECLARE(void, Platform, init0)(ACR_JNISTDARGS,
jintArray p)
{
+ int e;
jint ia[32];
UNREFERENCED_O;
(*_E)->GetIntArrayRegion(_E, p, 0, 16, &ia[0]);
+ if ((e = acr_ioh_init(ia[0]))) {
+ /* Error initializing descriptor map table.
+ * We cannot continue.
+ */
+ ACR_ThrowException(_E, THROW_NMARK, ACR_EX_OSERR, e);
+ return;
+ }
acr_native_codepage = ia[1];
ia[0] = sizeof(int);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/platform.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/platform.c?rev=789222&r1=789221&r2=789222&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/platform.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/platform.c Mon Jun 29 05:55:55 2009
@@ -19,10 +19,12 @@
#include "acr_arch.h"
#include "acr_string.h"
#include "acr_platform.h"
+#include "acr_error.h"
#include <locale.h>
#include <langinfo.h>
static const char unknown[] = "unknown";
+extern int acr_ioh_init(int);
acr_size_t acr_page_size;
int acr_native_codepage = ACR_CP_DEFAULT;
@@ -35,11 +37,19 @@
ACR_JNI_EXPORT_DECLARE(void, Platform, init0)(ACR_JNISTDARGS,
jintArray p)
{
+ int e;
jint ia[32];
UNREFERENCED_O;
(*_E)->GetIntArrayRegion(_E, p, 0, 16, &ia[0]);
+ if ((e = acr_ioh_init(ia[0]))) {
+ /* Error initializing descriptor map table.
+ * We cannot continue.
+ */
+ ACR_ThrowException(_E, THROW_NMARK, ACR_EX_OSERR, e);
+ return;
+ }
acr_native_codepage = ia[1];
ia[0] = sizeof(int);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c?rev=789222&r1=789221&r2=789222&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c Mon Jun 29 05:55:55 2009
@@ -51,7 +51,7 @@
ACR_ThrowException(_E, THROW_NMARK, ACR_EX_OSERR, e);
return;
}
- acr_native_codepage = ia[1];
+ acr_native_codepage = ia[1];
ia[0] = sizeof(int);
ia[1] = sizeof(long);