Author: chirino
Date: Fri Nov 20 16:02:56 2009
New Revision: 882626
URL: http://svn.apache.org/viewvc?rev=882626&view=rev
Log:
Updating annotations to pickup the latest change in the hawtjni generator.
Modified:
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/AIO.java
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/IO.java
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/Posix.java
Modified:
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/AIO.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/AIO.java?rev=882626&r1=882625&r2=882626&view=diff
==============================================================================
---
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/AIO.java
(original)
+++
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/AIO.java
Fri Nov 20 16:02:56 2009
@@ -31,7 +31,7 @@
*
* @author <a href="http://hiramchirino.com";>Hiram Chirino</a>
*/
-...@jniclass
+...@jniclass(conditional="defined(HAVE_AIO_H)")
public class AIO {
static {
CLibrary.LIBRARY.load();
@@ -41,16 +41,16 @@
@JniMethod(flags={CONSTANT_INITIALIZER})
private static final native void init();
- @JniField(flags={FieldFlag.CONSTANT}, conditional="#ifdef HAVE_AIO_H",
accessor="1")
+ @JniField(flags={FieldFlag.CONSTANT}, accessor="1")
public static boolean SUPPORTED;
- @JniField(flags={FieldFlag.CONSTANT}, conditional="#ifdef HAVE_AIO_H")
+ @JniField(flags={FieldFlag.CONSTANT})
public static int EINPROGRESS;
// @JniField(flags={FieldFlag.CONSTANT})
// public static int ECANCELLED;
- @JniClass(flags={ClassFlag.STRUCT, ClassFlag.ZERO_OUT},
conditional="#ifdef HAVE_AIO_H")
+ @JniClass(flags={ClassFlag.STRUCT, ClassFlag.ZERO_OUT},
conditional="defined(HAVE_AIO_H)")
static public class aiocb {
static {
CLibrary.LIBRARY.load();
@@ -60,7 +60,7 @@
@JniMethod(flags={CONSTANT_INITIALIZER})
private static final native void init();
- @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct aiocb)",
conditional="#ifdef HAVE_AIO_H")
+ @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct aiocb)")
public static int SIZEOF;
public int aio_fildes;
@@ -76,20 +76,18 @@
// int aio_lio_opcode;
// int aio_flags;
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native void memmove (
@JniArg(cast="void *", flags={NO_IN, CRITICAL}) aiocb dest,
@JniArg(cast="const void *") long src,
@JniArg(cast="size_t") long size);
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native void memmove (
@JniArg(cast="void *") long dest,
@JniArg(cast="const void *", flags={NO_OUT, CRITICAL}) aiocb
src,
@JniArg(cast="size_t") long size);
}
- @JniClass(flags={ClassFlag.STRUCT}, conditional="#ifdef HAVE_AIO_H")
+ @JniClass(flags={ClassFlag.STRUCT}, conditional="defined(HAVE_AIO_H)")
static public class timespec {
static {
@@ -100,7 +98,7 @@
@JniMethod(flags={CONSTANT_INITIALIZER})
private static final native void init();
- @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct
timespec)", conditional="#ifdef HAVE_AIO_H")
+ @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct
timespec)")
public static int SIZEOF;
@JniField(cast="time_t")
@@ -108,18 +106,15 @@
@JniField(cast="long")
public long tv_nsec;
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native void memmove (
@JniArg(cast="void *", flags={NO_IN, CRITICAL}) timespec dest,
@JniArg(cast="const void *") long src,
@JniArg(cast="size_t") long size);
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native void memmove (
@JniArg(cast="void *") long dest,
@JniArg(cast="const void *", flags={NO_OUT, CRITICAL})
timespec src,
@JniArg(cast="size_t") long size);
-
}
/**
@@ -127,7 +122,6 @@
* int aio_read(struct aiocb *aiocbp);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native int aio_read(
@JniArg(cast="struct aiocb *")long aiocbp);
@@ -136,7 +130,6 @@
* int aio_write(struct aiocb *aiocbp);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native int aio_write(
@JniArg(cast="struct aiocb *")long aiocbp);
@@ -145,7 +138,6 @@
* int aio_cancel(int fd, struct aiocb *aiocbp);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native int aio_cancel(
int fd,
@JniArg(cast="struct aiocb *")long aiocbp);
@@ -155,7 +147,6 @@
* int aio_error(const struct aiocb *aiocbp);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native int aio_error(
@JniArg(cast="const struct aiocb *")long aiocbp);
@@ -164,7 +155,6 @@
* ssize_t aio_return(struct aiocb *aiocbp);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native long aio_return(
@JniArg(cast="struct aiocb *")long aiocbp);
@@ -173,7 +163,6 @@
* int aio_suspend(const struct aiocb *const list[], int nent, const
struct timespec *timeout);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_AIO_H")
public static final native int aio_suspend(
@JniArg(cast="const struct aiocb *const*")long[] list,
int nent,
Modified:
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/IO.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/IO.java?rev=882626&r1=882625&r2=882626&view=diff
==============================================================================
---
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/IO.java
(original)
+++
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/IO.java
Fri Nov 20 16:02:56 2009
@@ -60,109 +60,109 @@
public static int O_TRUNC;
@JniField(flags={CONSTANT})
public static int O_EXCL;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_NONBLOCK")
+ @JniField(flags={CONSTANT}, conditional="defined(O_NONBLOCK)")
public static int O_NONBLOCK;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_ASYNC")
+ @JniField(flags={CONSTANT}, conditional="defined(O_ASYNC)")
public static int O_ASYNC;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_SHLOCK")
+ @JniField(flags={CONSTANT}, conditional="defined(O_SHLOCK)")
public static int O_SHLOCK;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_EXLOCK")
+ @JniField(flags={CONSTANT}, conditional="defined(O_EXLOCK)")
public static int O_EXLOCK;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_NOFOLLOW")
+ @JniField(flags={CONSTANT}, conditional="defined(O_NOFOLLOW)")
public static int O_NOFOLLOW;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_SYMLINK")
+ @JniField(flags={CONSTANT}, conditional="defined(O_SYMLINK)")
public static int O_SYMLINK;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_EVTONLY")
+ @JniField(flags={CONSTANT}, conditional="defined(O_EVTONLY)")
public static int O_EVTONLY;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_DIRECT")
+ @JniField(flags={CONSTANT}, conditional="defined(O_DIRECT)")
public static int O_DIRECT;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_CLOEXEC")
+ @JniField(flags={CONSTANT}, conditional="defined(O_CLOEXEC)")
public static int O_CLOEXEC;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_DIRECTORY")
+ @JniField(flags={CONSTANT}, conditional="defined(O_DIRECTORY)")
public static int O_DIRECTORY;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_LARGEFILE")
+ @JniField(flags={CONSTANT}, conditional="defined(O_LARGEFILE)")
public static int O_LARGEFILE;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_NOATIME")
+ @JniField(flags={CONSTANT}, conditional="defined(O_NOATIME)")
public static int O_NOATIME;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_NOCTTY")
+ @JniField(flags={CONSTANT}, conditional="defined(O_NOCTTY)")
public static int O_NOCTTY;
- @JniField(flags={CONSTANT}, conditional="#ifdef O_SYNC")
+ @JniField(flags={CONSTANT}, conditional="defined(O_SYNC)")
public static int O_SYNC;
// Mode Constants
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IRWXU")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IRWXU)")
public static int S_IRWXU;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IRUSR")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IRUSR)")
public static int S_IRUSR;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IWUSR")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IWUSR)")
public static int S_IWUSR;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IXUSR")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IXUSR)")
public static int S_IXUSR;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IRWXG")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IRWXG)")
public static int S_IRWXG;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IRGRP")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IRGRP)")
public static int S_IRGRP;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IWGRP")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IWGRP)")
public static int S_IWGRP;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IXGRP")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IXGRP)")
public static int S_IXGRP;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IRWXO")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IRWXO)")
public static int S_IRWXO;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IROTH")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IROTH)")
public static int S_IROTH;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IWOTH")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IWOTH)")
public static int S_IWOTH;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_IXOTH")
+ @JniField(flags={CONSTANT}, conditional="defined(S_IXOTH)")
public static int S_IXOTH;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_ISUID")
+ @JniField(flags={CONSTANT}, conditional="defined(S_ISUID)")
public static int S_ISUID;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_ISGID")
+ @JniField(flags={CONSTANT}, conditional="defined(S_ISGID)")
public static int S_ISGID;
- @JniField(flags={CONSTANT}, conditional="#ifdef S_ISVTX")
+ @JniField(flags={CONSTANT}, conditional="defined(S_ISVTX)")
public static int S_ISVTX;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_DUPFD")
+ @JniField(flags={CONSTANT}, conditional="defined(F_DUPFD)")
public static int F_DUPFD;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_GETFD")
+ @JniField(flags={CONSTANT}, conditional="defined(F_GETFD)")
public static int F_GETFD;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_SETFD")
+ @JniField(flags={CONSTANT}, conditional="defined(F_SETFD)")
public static int F_SETFD;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_GETFL")
+ @JniField(flags={CONSTANT}, conditional="defined(F_GETFL)")
public static int F_GETFL;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_SETFL")
+ @JniField(flags={CONSTANT}, conditional="defined(F_SETFL)")
public static int F_SETFL;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_GETOWN")
+ @JniField(flags={CONSTANT}, conditional="defined(F_GETOWN)")
public static int F_GETOWN;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_SETOWN")
+ @JniField(flags={CONSTANT}, conditional="defined(F_SETOWN)")
public static int F_SETOWN;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_GETLK")
+ @JniField(flags={CONSTANT}, conditional="defined(F_GETLK)")
public static int F_GETLK;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_SETLK")
+ @JniField(flags={CONSTANT}, conditional="defined(F_SETLK)")
public static int F_SETLK;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_SETLKW")
+ @JniField(flags={CONSTANT}, conditional="defined(F_SETLKW)")
public static int F_SETLKW;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_GETPATH")
+ @JniField(flags={CONSTANT}, conditional="defined(F_GETPATH)")
public static int F_GETPATH;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_PREALLOCATE")
+ @JniField(flags={CONSTANT}, conditional="defined(F_PREALLOCATE)")
public static int F_PREALLOCATE;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_SETSIZE")
+ @JniField(flags={CONSTANT}, conditional="defined(F_SETSIZE)")
public static int F_SETSIZE;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_RDADVISE")
+ @JniField(flags={CONSTANT}, conditional="defined(F_RDADVISE)")
public static int F_RDADVISE;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_RDAHEAD")
+ @JniField(flags={CONSTANT}, conditional="defined(F_RDAHEAD)")
public static int F_RDAHEAD;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_READBOOTSTRAP")
+ @JniField(flags={CONSTANT}, conditional="defined(F_READBOOTSTRAP)")
public static int F_READBOOTSTRAP;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_WRITEBOOTSTRAP")
+ @JniField(flags={CONSTANT}, conditional="defined(F_WRITEBOOTSTRAP)")
public static int F_WRITEBOOTSTRAP;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_NOCACHE")
+ @JniField(flags={CONSTANT}, conditional="defined(F_NOCACHE)")
public static int F_NOCACHE;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_LOG2PHYS")
+ @JniField(flags={CONSTANT}, conditional="defined(F_LOG2PHYS)")
public static int F_LOG2PHYS;
- @JniField(flags={CONSTANT}, conditional="#ifdef F_FULLFSYNC")
+ @JniField(flags={CONSTANT}, conditional="defined(F_FULLFSYNC)")
public static int F_FULLFSYNC;
///////////////////////////////////////////////////////////////////
@@ -191,7 +191,7 @@
*/
public static final native int close(int fd);
- @JniField(flags={FieldFlag.CONSTANT}, conditional="#ifdef
HAVE_FCNTL_FUNCTION", accessor="1")
+ @JniField(flags={FieldFlag.CONSTANT},
conditional="defined(HAVE_FCNTL_FUNCTION)", accessor="1")
public static boolean HAVE_FCNTL_FUNCTION;
/**
@@ -199,7 +199,7 @@
* int fcntl(int fd, int cmd, ...);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_FCNTL_FUNCTION")
+ @JniMethod(conditional="defined(HAVE_FCNTL_FUNCTION)")
public static final native int fcntl(int fd, int cmd);
/**
@@ -207,7 +207,7 @@
* int fcntl(int fd, int cmd, ...);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_FCNTL_FUNCTION")
+ @JniMethod(conditional="defined(HAVE_FCNTL_FUNCTION)")
public static final native int fcntl(int fd, int cmd, long arg);
@JniMethod(cast="size_t")
@@ -222,34 +222,34 @@
@JniArg(cast="const void *") long buffer,
@JniArg(cast="size_t") long length);
- @JniMethod(cast="size_t", conditional="#ifdef HAVE_PREAD_FUNCTION")
+ @JniMethod(cast="size_t", conditional="defined(HAVE_PREAD_FUNCTION)")
public static final native long pread(
int fd,
@JniArg(cast="void *") long buffer,
@JniArg(cast="size_t") long length,
@JniArg(cast="size_t") long offset);
- @JniMethod(cast="size_t", conditional="#ifdef HAVE_PREAD_FUNCTION")
+ @JniMethod(cast="size_t", conditional="defined(HAVE_PREAD_FUNCTION)")
public static final native long pwrite(
int fd,
@JniArg(cast="const void *") long buffer,
@JniArg(cast="size_t") long length,
@JniArg(cast="size_t") long offset);
- @JniMethod(cast="size_t", conditional="#ifdef HAVE_READV_FUNCTION")
+ @JniMethod(cast="size_t", conditional="defined(HAVE_READV_FUNCTION)")
public static final native long readv(
int fd,
@JniArg(cast="const struct iovec *") long iov,
int count);
- @JniMethod(cast="size_t", conditional="#ifdef HAVE_READV_FUNCTION")
+ @JniMethod(cast="size_t", conditional="defined(HAVE_READV_FUNCTION)")
public static final native long writev(
int fd,
@JniArg(cast="const struct iovec *") long iov,
int count);
- @JniClass(flags={ClassFlag.STRUCT}, conditional="#ifdef
HAVE_READV_FUNCTION")
+ @JniClass(flags={ClassFlag.STRUCT},
conditional="defined(HAVE_READV_FUNCTION)")
static public class iovec {
static {
@@ -260,7 +260,7 @@
@JniMethod(flags={CONSTANT_INITIALIZER})
private static final native void init();
- @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct iovec)",
conditional="#ifdef HAVE_READV_FUNCTION")
+ @JniField(flags={FieldFlag.CONSTANT}, accessor="sizeof(struct iovec)",
conditional="defined(HAVE_READV_FUNCTION)")
public static int SIZEOF;
@JniField(cast="char *")
@@ -268,19 +268,19 @@
@JniField(cast="size_t")
public long iov_len;
- @JniMethod(conditional="#ifdef HAVE_READV_FUNCTION")
+ @JniMethod(conditional="defined(HAVE_READV_FUNCTION)")
public static final native void memmove (
@JniArg(cast="void *", flags={NO_IN, CRITICAL}) iovec dest,
@JniArg(cast="const void *") long src,
@JniArg(cast="size_t") long size);
- @JniMethod(conditional="#ifdef HAVE_READV_FUNCTION")
+ @JniMethod(conditional="defined(HAVE_READV_FUNCTION)")
public static final native void memmove (
@JniArg(cast="void *") long dest,
@JniArg(cast="const void *", flags={NO_OUT, CRITICAL}) iovec
src,
@JniArg(cast="size_t") long size);
- @JniMethod(cast="struct iovec *", accessor="add", conditional="#ifdef
HAVE_READV_FUNCTION")
+ @JniMethod(cast="struct iovec *", accessor="add",
conditional="defined(HAVE_READV_FUNCTION)")
public static final native long iovec_add(
@JniArg(cast="struct iovec *") long ptr,
long amount);
Modified:
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/Posix.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/Posix.java?rev=882626&r1=882625&r2=882626&view=diff
==============================================================================
---
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/Posix.java
(original)
+++
activemq/sandbox/activemq-apollo/activemq-syscall/src/main/java/org/apache/activemq/syscall/jni/Posix.java
Fri Nov 20 16:02:56 2009
@@ -32,7 +32,7 @@
* int posix_memalign(void **ptrRef, size_t alignment, size_t len);
* </pre></code>
*/
- @JniMethod(conditional="#ifdef HAVE_POSIX_MEMALIGN_FUNCTION")
+ @JniMethod(conditional="defined(HAVE_POSIX_MEMALIGN_FUNCTION)")
public static final native int posix_memalign(
@JniArg(cast="void **") long ptrRef[],
@JniArg(cast="size_t") long alignment,
