May 2009 - bsd-port-dev

getfsstat(2) based BsdFileSystem.getMountEntries()
by Kurt Miller 26 May '09

26 May '09

The current BsdFileSystem.getMountEntries() implementation parses /etc/fstab. Apple doesn't use /etc/fstab so that wont work for Apple, however all BSD's and Apple have getfsstat(2). Please test the attached patch on OS X to see if it makes the following test program work: *** MountTest.java ***: import java.util.*; import java.io.*; import java.nio.file.*; import java.nio.file.attribute.*; class MountTest { public static void main(String[] a) { for (FileStore store: FileSystems.getDefault().getFileStores()) { System.out.println("FileStore: " + store); System.out.println(" type: " + store.type() + " isReadOnly: " + store.isReadOnly()); try { FileStoreSpaceAttributes attrs = Attributes.readFileStoreSpaceAttributes( store); long total = attrs.totalSpace() / 1024; long used = (attrs.totalSpace() - attrs.unallocatedSpace()) / 1024; long avail = attrs.usableSpace() / 1024; System.out.format(" total %12d used %12d avail %12d%n", total, used, ava il); } catch(IOException ex) { ex.printStackTrace(); } } } } diff -r edf86ee176b8 make/java/nio/Makefile --- a/make/java/nio/Makefile Fri May 22 13:55:33 2009 -0700 +++ b/make/java/nio/Makefile Tue May 26 09:02:25 2009 -0400 @@ -275,6 +275,7 @@ sun/nio/fs/BsdFileStore.java \ sun/nio/fs/BsdFileSystem.java \ sun/nio/fs/BsdFileSystemProvider.java \ + sun/nio/fs/BsdNativeDispatcher.java \ sun/nio/fs/PollingWatchService.java \ sun/nio/fs/UnixChannelFactory.java \ sun/nio/fs/UnixCopyFile.java \ @@ -303,6 +304,7 @@ UnixAsynchronousSocketChannelImpl.c \ \ GnomeFileTypeDetector.c \ + BsdNativeDispatcher.c \ UnixCopyFile.c \ UnixNativeDispatcher.c @@ -313,6 +315,7 @@ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ \ sun/nio/fs/GnomeFileTypeDetector.java \ + sun/nio/fs/BsdNativeDispatcher.java \ sun/nio/fs/UnixCopyFile.java \ sun/nio/fs/UnixNativeDispatcher.java diff -r edf86ee176b8 make/java/nio/mapfile-bsd --- a/make/java/nio/mapfile-bsd Fri May 22 13:55:33 2009 -0700 +++ b/make/java/nio/mapfile-bsd Tue May 26 09:02:25 2009 -0400 @@ -36,25 +36,6 @@ Java_sun_nio_ch_DatagramDispatcher_readv0; Java_sun_nio_ch_DatagramDispatcher_write0; Java_sun_nio_ch_DatagramDispatcher_writev0; - Java_sun_nio_ch_EPollArrayWrapper_epollCreate; - Java_sun_nio_ch_EPollArrayWrapper_epollCtl; - Java_sun_nio_ch_EPollArrayWrapper_epollWait; - Java_sun_nio_ch_EPollArrayWrapper_fdLimit; - Java_sun_nio_ch_EPollArrayWrapper_init; - Java_sun_nio_ch_EPollArrayWrapper_interrupt; - Java_sun_nio_ch_EPollArrayWrapper_offsetofData; - Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent; - Java_sun_nio_ch_EPoll_init; - Java_sun_nio_ch_EPoll_eventSize; - Java_sun_nio_ch_EPoll_eventsOffset; - Java_sun_nio_ch_EPoll_dataOffset; - Java_sun_nio_ch_EPoll_epollCreate; - Java_sun_nio_ch_EPoll_epollCtl; - Java_sun_nio_ch_EPoll_epollWait; - Java_sun_nio_ch_EPollPort_close0; - Java_sun_nio_ch_EPollPort_drain1; - Java_sun_nio_ch_EPollPort_interrupt; - Java_sun_nio_ch_EPollPort_socketpair; Java_sun_nio_ch_FileChannelImpl_close0; Java_sun_nio_ch_FileChannelImpl_initIDs; Java_sun_nio_ch_FileChannelImpl_map0; @@ -126,23 +107,11 @@ Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio; Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs; Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs; - Java_sun_nio_fs_BsdWatchService_init; - Java_sun_nio_fs_BsdWatchService_eventSize; - Java_sun_nio_fs_BsdWatchService_eventOffsets; - Java_sun_nio_fs_BsdWatchService_inotifyInit; - Java_sun_nio_fs_BsdWatchService_inotifyAddWatch; - Java_sun_nio_fs_BsdWatchService_inotifyRmWatch; - Java_sun_nio_fs_BsdWatchService_configureBlocking; - Java_sun_nio_fs_BsdWatchService_socketpair; - Java_sun_nio_fs_BsdWatchService_poll; - Java_sun_nio_fs_BsdNativeDispatcher_init; - Java_sun_nio_fs_BsdNativeDispatcher_fgetxattr0; - Java_sun_nio_fs_BsdNativeDispatcher_flistxattr; - Java_sun_nio_fs_BsdNativeDispatcher_fsetxattr0; - Java_sun_nio_fs_BsdNativeDispatcher_fremovexattr0; - Java_sun_nio_fs_BsdNativeDispatcher_setmntent0; - Java_sun_nio_fs_BsdNativeDispatcher_endmntent; Java_sun_nio_fs_UnixNativeDispatcher_initIDs; + Java_sun_nio_fs_BsdNativeDispatcher_initIDs; + Java_sun_nio_fs_BsdNativeDispatcher_getfsstat; + Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry; + Java_sun_nio_fs_BsdNativeDispatcher_endfsstat; Java_sun_nio_fs_UnixNativeDispatcher_getcwd; Java_sun_nio_fs_UnixNativeDispatcher_strerror; Java_sun_nio_fs_UnixNativeDispatcher_dup; diff -r edf86ee176b8 src/solaris/classes/sun/nio/fs/BsdFileSystem.java --- a/src/solaris/classes/sun/nio/fs/BsdFileSystem.java Fri May 22 13:55:33 2009 -0700 +++ b/src/solaris/classes/sun/nio/fs/BsdFileSystem.java Tue May 26 09:02:25 2009 -0400 @@ -31,7 +31,6 @@ import java.util.*; import java.security.AccessController; import sun.security.action.GetPropertyAction; -import static sun.nio.fs.UnixNativeDispatcher.*; /** * Bsd implementation of FileSystem @@ -95,24 +94,23 @@ } /** - * Returns object to iterate over entries in /etc/fstab + * Returns object to iterate over mount entries */ @Override Iterable<UnixMountEntry> getMountEntries() { ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); try { - UnixPath fstab = new UnixPath(this, "/etc/fstab"); - long fp = fopen(fstab, "r"); + long iter = BsdNativeDispatcher.getfsstat(); try { for (;;) { UnixMountEntry entry = new UnixMountEntry(); - int res = getextmntent(fp, entry); + int res = BsdNativeDispatcher.fsstatEntry(iter, entry); if (res < 0) break; entries.add(entry); } } finally { - fclose(fp); + BsdNativeDispatcher.endfsstat(iter); } } catch (UnixException x) { diff -r edf86ee176b8 src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java Tue May 26 09:02:25 2009 -0400 @@ -0,0 +1,65 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +package sun.nio.fs; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * Bsd specific system calls. + */ + +class BsdNativeDispatcher extends UnixNativeDispatcher { + private BsdNativeDispatcher() { } + + /** + * struct fsstat_iter *getfsstat(); + */ + static native long getfsstat() throws UnixException; + + /** + * int fsstatEntry(struct fsstat_iter * iter, UnixMountEntry entry); + */ + static native int fsstatEntry(long iter, UnixMountEntry entry) + throws UnixException; + + /** + * void endfsstat(struct fsstat_iter * iter); + */ + static native void endfsstat(long iter) throws UnixException; + + // initialize field IDs + private static native void initIDs(); + + static { + AccessController.doPrivileged(new PrivilegedAction<Void>() { + public Void run() { + System.loadLibrary("nio"); + return null; + }}); + initIDs(); + } +} diff -r edf86ee176b8 src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c Tue May 26 09:02:25 2009 -0400 @@ -0,0 +1,201 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +#include "jni.h" +#include "jni_util.h" +#include "jvm.h" +#include "jlong.h" + +#include <sys/param.h> +#include <sys/mount.h> + +#include <stdlib.h> +#include <string.h> + +static jfieldID entry_name; +static jfieldID entry_dir; +static jfieldID entry_fstype; +static jfieldID entry_options; +static jfieldID entry_dev; + +struct fsstat_iter { + struct statfs *buf; + int pos; + int nentries; +}; + +#include "sun_nio_fs_BsdNativeDispatcher.h" + +static void throwUnixException(JNIEnv* env, int errnum) { + jobject x = JNU_NewObjectByName(env, "sun/nio/fs/UnixException", + "(I)V", errnum); + if (x != NULL) { + (*env)->Throw(env, x); + } +} + +/** + * Initialize jfieldIDs + */ +JNIEXPORT void JNICALL +Java_sun_nio_fs_BsdNativeDispatcher_initIDs(JNIEnv* env, jclass this) +{ + jclass clazz; + + clazz = (*env)->FindClass(env, "sun/nio/fs/UnixMountEntry"); + if (clazz == NULL) { + return; + } + entry_name = (*env)->GetFieldID(env, clazz, "name", "[B"); + entry_dir = (*env)->GetFieldID(env, clazz, "dir", "[B"); + entry_fstype = (*env)->GetFieldID(env, clazz, "fstype", "[B"); + entry_options = (*env)->GetFieldID(env, clazz, "opts", "[B"); + entry_dev = (*env)->GetFieldID(env, clazz, "dev", "J"); +} + +JNIEXPORT jlong JNICALL +Java_sun_nio_fs_BsdNativeDispatcher_getfsstat(JNIEnv* env, jclass this) +{ + int nentries; + size_t bufsize; + struct fsstat_iter *iter = (struct fsstat_iter *)malloc(sizeof(*iter)); + + if (iter == NULL) { + JNU_ThrowOutOfMemoryError(env, "native heap"); + return NULL; + } + + iter->pos = 0; + iter->nentries = 0; + iter->buf = NULL; + + nentries = getfsstat(NULL, 0, MNT_NOWAIT); + + if (nentries <= 0) { + free(iter); + throwUnixException(env, errno); + return NULL; + } + + // It's possible that a new filesystem gets mounted between + // the first getfsstat and the second so loop until consistant + + while (nentries != iter->nentries) { + if (iter->buf != NULL) + free(iter->buf); + + bufsize = nentries * sizeof(struct statfs); + iter->nentries = nentries; + + iter->buf = (struct statfs *)malloc(bufsize); + if (iter->buf == NULL) { + free(iter); + JNU_ThrowOutOfMemoryError(env, "native heap"); + return NULL; + } + + nentries = getfsstat(iter->buf, bufsize, MNT_WAIT); + if (nentries <= 0) { + free(iter->buf); + free(iter); + throwUnixException(env, errno); + return NULL; + } + } + + return (jlong)iter; +} + +JNIEXPORT jint JNICALL +Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry(JNIEnv* env, jclass this, + jlong value, jobject entry) +{ + struct fsstat_iter *iter = jlong_to_ptr(value); + jsize len; + jbyteArray bytes; + char* name; + char* dir; + char* fstype; + char* options; + dev_t dev; + + if (iter == NULL || iter->pos >= iter->nentries) + return -1; + + name = iter->buf[iter->pos].f_mntfromname; + dir = iter->buf[iter->pos].f_mntonname; + fstype = iter->buf[iter->pos].f_fstypename; + if (iter->buf[iter->pos].f_flags & MNT_RDONLY) + options="ro"; + else + options=""; + dev = 0; + + iter->pos++; + + len = strlen(name); + bytes = (*env)->NewByteArray(env, len); + if (bytes == NULL) + return -1; + (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)name); + (*env)->SetObjectField(env, entry, entry_name, bytes); + + len = strlen(dir); + bytes = (*env)->NewByteArray(env, len); + if (bytes == NULL) + return -1; + (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)dir); + (*env)->SetObjectField(env, entry, entry_dir, bytes); + + len = strlen(fstype); + bytes = (*env)->NewByteArray(env, len); + if (bytes == NULL) + return -1; + (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)fstype); + (*env)->SetObjectField(env, entry, entry_fstype, bytes); + + len = strlen(options); + bytes = (*env)->NewByteArray(env, len); + if (bytes == NULL) + return -1; + (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)options); + (*env)->SetObjectField(env, entry, entry_options, bytes); + + if (dev != 0) + (*env)->SetLongField(env, entry, entry_dev, (jlong)dev); + + return 0; +} + +JNIEXPORT void JNICALL +Java_sun_nio_fs_BsdNativeDispatcher_endfsstat(JNIEnv* env, jclass this, jlong value) +{ + struct fsstat_iter *iter = jlong_to_ptr(value); + + if (iter != NULL) { + free(iter->buf); + free(iter); + } +}

1 0

Invitation to connect on LinkedIn
by David Green 23 May '09

23 May '09

LinkedIn ------------ I'd like to add you to my professional network on LinkedIn. - David Learn more: https://www.linkedin.com/e/isd/594488789/GYDY7UUd/ ------------------------------------------ What is LinkedIn and why should you join? http://learn.linkedin.com/what-is-linkedin ------ (c) 2009, LinkedIn Corporation

1 0

hg: bsd-port/bsd-port/jdk: No-op support for the -Xdock: command line flag, for compatibility with Apple's VM options.
by landonf＠bikemonkey.org 23 May '09

23 May '09

Changeset: ef6bacd0a268 Author: Landon Fuller <landonf(a)plausiblelabs.com> Date: 2009-05-23 12:43 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/ef6bacd0a268 No-op support for the -Xdock: command line flag, for compatibility with Apple's VM options. See also: http://developer.apple.com/DOCUMENTATION/Java/Reference/Java_VMOptionsRef/A… ! src/share/bin/java.c

1 0

Trouble building on OS X
by Frank Wierzbicki 23 May '09

23 May '09

Hi all, I am attempting to build bsd-port on a Intel Core 2 Duo MacBook Pro with OS X 10.5.7. I followed Landon Fuller's instructions here: http://landonf.bikemonkey.org/code/java/SoyLatte_Meets_OpenJDK.20080819.html. But the build ends with: Linking vm... { \ echo Linking launcher...; \ \ cc -m32 -march=i586 -mstackrealign -m32 -march=i586 -mstackrealign -L `pwd` -o gamma launcher.o -ljvm -lm -pthread; \ \ } Linking launcher... ld: library not found for -ljvm collect2: ld returned 1 exit status make[6]: *** [gamma] Error 1 make[5]: *** [the_vm] Error 2 make[4]: *** [product] Error 2 make[3]: *** [generic_build2] Error 2 make[2]: *** [product] Error 2 make[1]: *** [hotspot-build] Error 2 make: *** [build_product_image] Error 2 Help? -Frank

7 8

-Xdock soylatte fix
by David Green 22 May '09

22 May '09

It looks like -Xdock is not recognized by the bsd port of OpenJDK. Eclipse passes that parameter to the VM, as does NetBeans by the look of this thread<http://mail.openjdk.java.net/pipermail/bsd-port-dev/2008-September/000032.h…>. Can someone (Landon?) merge that patch in from SoyLatte? Thanks, David

3 2

hg: bsd-port/bsd-port/jdk: Minor include fixes for Mac OS build.
by landonf＠bikemonkey.org 22 May '09

22 May '09

Changeset: edf86ee176b8 Author: Landon Fuller <landonf(a)plausiblelabs.com> Date: 2009-05-22 13:55 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/edf86ee176b8 Minor include fixes for Mac OS build. ! src/share/native/com/sun/java/util/jar/pack/main.cpp ! src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c

1 0

hg: bsd-port/bsd-port/hotspot: Remove space between -L and path to fix build on Apple
by kurt＠intricatesoftware.com 22 May '09

22 May '09

Changeset: f658ac06fb8e Author: kurt Date: 2009-05-22 11:31 -0400 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/hotspot/rev/f658ac06fb8e Remove space between -L and path to fix build on Apple ! make/bsd/makefiles/launcher.make

1 0

Eclipse on OpenJDK
by David Green 21 May '09

21 May '09

I'm working on getting Eclipse to run on the bsd port of OpenJDK out of the box. Currently I'm working on a couple of issues with Eclipse itself, one of which has me a little puzzled and I'm thinking that someone here might be able to shed some light. The issue (https://bugs.eclipse.org/bugs/show_bug.cgi?id=276763) is related to launching the VM using JNI. I've patched the Eclipse launcher to load the right libjvm.dylib using dlopen, however I'm getting the following error as discussed in comment #7<https://bugs.eclipse.org/bugs/show_bug.cgi?id=276763#c7> : Error occurred during initialization of VM Unable to load native library: dlopen(/Users/dgreen/Documents/packages/jdk7-32bit-2009-05-08/jre/lib/i386/libjava.dylib,1): Library not loaded: libjvm.dylib Referenced from: /Users/dgreen/Documents/packages/jdk7-32bit-2009-05-08/jre/lib/i386/libjava.dylib Reason: image not found Is it possible to launch the VM using this method or should I be trying to launch it using exec()? Any help would be much appreciated. Thanks, David

2 2

hg: bsd-port/bsd-port/langtools: 3 new changesets
by kurt＠intricatesoftware.com 20 May '09

20 May '09

Changeset: 88bcb6772159 Author: vasya Date: 2009-05-11 12:08 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/langtools/rev/88bcb6772159 Added tag jdk7-b58 for changeset 5bcac54d408b ! .hgtags Changeset: 0f653be1a42f Author: vasya Date: 2009-05-14 10:58 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/langtools/rev/0f653be1a42f Added tag jdk7-b59 for changeset 88bcb6772159 ! .hgtags Changeset: 0ae251a31ec3 Author: kurt Date: 2009-05-20 18:52 -0400 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/langtools/rev/0ae251a31ec3 Merge jdk7-b59 from main OpenJDK repository.

1 0

hg: bsd-port/bsd-port/jaxws: 3 new changesets
by kurt＠intricatesoftware.com 20 May '09

20 May '09

Changeset: f64566bf4c2b Author: vasya Date: 2009-05-11 12:08 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jaxws/rev/f64566bf4c2b Added tag jdk7-b58 for changeset 5fb4fbea81c3 ! .hgtags Changeset: 4fa7398559d0 Author: vasya Date: 2009-05-14 10:58 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jaxws/rev/4fa7398559d0 Added tag jdk7-b59 for changeset f64566bf4c2b ! .hgtags Changeset: 8bd533172de4 Author: kurt Date: 2009-05-20 18:51 -0400 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jaxws/rev/8bd533172de4 Merge jdk7-b59 from main OpenJDK repository.

1 0