Author: adc
Date: Tue Jan 19 14:52:48 2010
New Revision: 900804
URL: http://svn.apache.org/viewvc?rev=900804&view=rev
Log:
DIRMINA-707 Add sendfile support to APR transport
Added:
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java?rev=900804&r1=900803&r2=900804&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
Tue Jan 19 14:52:48 2010
@@ -78,4 +78,12 @@
remainingBytes -= value;
}
+ public String getFilename() {
+ return null;
+ }
+
+ public boolean hasFilename() {
+ return false;
+ }
+
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java?rev=900804&r1=900803&r2=900804&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java Tue
Jan 19 14:52:48 2010
@@ -68,4 +68,18 @@
*/
long getWrittenBytes();
+ /**
+ * Indicates if the FileRegion has the filename for the underlying
FileChannel.
+ *
+ * @return true if getFilename() will return a valid filename
+ */
+ boolean hasFilename();
+
+ /**
+ * Provides an absolute filename for the underlying FileChannel.
+ *
+ * @return the absolute filename, or <tt>null</tt> if the FileRegion
+ * does not know the filename
+ */
+ String getFilename();
}
Added:
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java?rev=900804&view=auto
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java
(added)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java
Tue Jan 19 14:52:48 2010
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.mina.core.file;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+
+
+/**
+ * TODO Add documentation
+ *
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Rev$, $Date$
+ */
+public class FilenameFileRegion extends DefaultFileRegion {
+
+ private final File file;
+
+ public FilenameFileRegion(File file, FileChannel channel) throws
IOException {
+ this(file, channel, 0, file.length());
+ }
+
+ public FilenameFileRegion(File file, FileChannel channel, long position,
long remainingBytes) {
+ super(channel, position, remainingBytes);
+
+ if (file == null) {
+ throw new IllegalArgumentException("file can not be null");
+ }
+ this.file = file;
+ }
+
+ public boolean hasFilename() {
+ return true;
+ }
+
+ public String getFilename() {
+ return file.getAbsolutePath();
+ }
+}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java?rev=900804&r1=900803&r2=900804&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
Tue Jan 19 14:52:48 2010
@@ -33,6 +33,7 @@
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.file.DefaultFileRegion;
+import org.apache.mina.core.file.FilenameFileRegion;
import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.future.CloseFuture;
import org.apache.mina.core.future.DefaultCloseFuture;
@@ -412,7 +413,7 @@
} else if (message instanceof File) {
File file = (File) message;
openedFileChannel = new FileInputStream(file).getChannel();
- message = new DefaultFileRegion(openedFileChannel, 0,
openedFileChannel.size());
+ message = new FilenameFileRegion(file, openedFileChannel, 0,
openedFileChannel.size());
}
} catch (IOException e) {
ExceptionMonitor.getInstance().exceptionCaught(e);
Modified:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?rev=900804&r1=900803&r2=900804&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
Tue Jan 19 14:52:48 2010
@@ -33,6 +33,7 @@
import org.apache.mina.core.polling.AbstractPollingIoProcessor;
import org.apache.mina.core.session.SessionState;
import org.apache.mina.util.CircularQueue;
+import org.apache.tomcat.jni.File;
import org.apache.tomcat.jni.Poll;
import org.apache.tomcat.jni.Pool;
import org.apache.tomcat.jni.Socket;
@@ -440,7 +441,26 @@
*/
@Override
protected int transferFile(AprSession session, FileRegion region, int
length) throws Exception {
- throw new UnsupportedOperationException();
+ if (!region.hasFilename()) {
+ throw new UnsupportedOperationException();
+ }
+
+ long fd = File.open(region.getFilename(),
+ File.APR_FOPEN_READ
+ | File.APR_FOPEN_SENDFILE_ENABLED
+ | File.APR_FOPEN_BINARY,
+ 0,
+ Socket.pool(session.getDescriptor()));
+ long numWritten = Socket.sendfilen(session.getDescriptor(), fd,
region.getPosition(), length, 0);
+ File.close(fd);
+
+ if (numWritten < 0) {
+ if (numWritten == -Status.EAGAIN) {
+ return 0;
+ }
+ throw new IOException(org.apache.tomcat.jni.Error.strerror((int)
-numWritten) + " (code: " + numWritten + ")");
+ }
+ return (int) numWritten;
}
private void throwException(int code) throws IOException {
