doc/cxxapi/Bucket_8h-source.html in passenger-2.2.2 vs doc/cxxapi/Bucket_8h-source.html in passenger-2.2.3
- old
+ new
@@ -43,35 +43,72 @@
<a name="l00022"></a>00022 <span class="comment"> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN</span>
<a name="l00023"></a>00023 <span class="comment"> * THE SOFTWARE.</span>
<a name="l00024"></a>00024 <span class="comment"> */</span>
<a name="l00025"></a>00025 <span class="preprocessor">#ifndef _PASSENGER_BUCKET_H_</span>
<a name="l00026"></a>00026 <span class="preprocessor"></span><span class="preprocessor">#define _PASSENGER_BUCKET_H_</span>
-<a name="l00027"></a>00027 <span class="preprocessor"></span><span class="comment"></span>
-<a name="l00028"></a>00028 <span class="comment">/**</span>
-<a name="l00029"></a>00029 <span class="comment"> * apr_bucket_pipe closes a pipe's file descriptor when it has reached</span>
-<a name="l00030"></a>00030 <span class="comment"> * end-of-stream, but not when an error has occurred. This behavior is</span>
-<a name="l00031"></a>00031 <span class="comment"> * undesirable because it can easily cause file descriptor leaks.</span>
-<a name="l00032"></a>00032 <span class="comment"> *</span>
-<a name="l00033"></a>00033 <span class="comment"> * passenger_bucket is like apr_bucket_pipe, but it also holds a reference to</span>
-<a name="l00034"></a>00034 <span class="comment"> * a Session. When a read error has occured or when end-of-stream has been</span>
-<a name="l00035"></a>00035 <span class="comment"> * reached, the Session will be dereferenced, so that the underlying file</span>
-<a name="l00036"></a>00036 <span class="comment"> * descriptor is closed.</span>
-<a name="l00037"></a>00037 <span class="comment"> *</span>
-<a name="l00038"></a>00038 <span class="comment"> * passenger_bucket also ignores the APR_NONBLOCK_READ flag because that's</span>
-<a name="l00039"></a>00039 <span class="comment"> * known to cause strange I/O problems.</span>
-<a name="l00040"></a>00040 <span class="comment"> */</span>
-<a name="l00041"></a>00041
-<a name="l00042"></a>00042 <span class="preprocessor">#include <apr_buckets.h></span>
-<a name="l00043"></a>00043 <span class="preprocessor">#include "Application.h"</span>
-<a name="l00044"></a>00044
-<a name="l00045"></a>00045 apr_bucket *passenger_bucket_create(Passenger::Application::SessionPtr session,
-<a name="l00046"></a>00046 apr_file_t *pipe,
-<a name="l00047"></a>00047 apr_bucket_alloc_t *list);
-<a name="l00048"></a>00048
-<a name="l00049"></a>00049 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_BUCKET_H_ */</span>
-<a name="l00050"></a>00050
+<a name="l00027"></a>00027 <span class="preprocessor"></span>
+<a name="l00028"></a>00028 <span class="preprocessor">#include <boost/shared_ptr.hpp></span>
+<a name="l00029"></a>00029 <span class="preprocessor">#include <apr_buckets.h></span>
+<a name="l00030"></a>00030 <span class="preprocessor">#include "Application.h"</span>
+<a name="l00031"></a>00031
+<a name="l00032"></a>00032 <span class="keyword">namespace </span>Passenger {
+<a name="l00033"></a>00033
+<a name="l00034"></a>00034 <span class="keyword">using namespace </span>boost;
+<a name="l00035"></a>00035
+<a name="l00036"></a>00036 <span class="keyword">struct </span>PassengerBucketState {<span class="comment"></span>
+<a name="l00037"></a>00037 <span class="comment"> /** The number of bytes that this PassengerBucket has read so far. */</span>
+<a name="l00038"></a>00038 <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bytesRead;
+<a name="l00039"></a>00039 <span class="comment"></span>
+<a name="l00040"></a>00040 <span class="comment"> /** Whether this PassengerBucket is completed, i.e. no more data</span>
+<a name="l00041"></a>00041 <span class="comment"> * can be read from the underlying file descriptor. When true,</span>
+<a name="l00042"></a>00042 <span class="comment"> * this can either mean that EOF has been reached, or that an I/O</span>
+<a name="l00043"></a>00043 <span class="comment"> * error occured. Use errorCode to check whether an error occurred.</span>
+<a name="l00044"></a>00044 <span class="comment"> */</span>
+<a name="l00045"></a>00045 <span class="keywordtype">bool</span> completed;
+<a name="l00046"></a>00046 <span class="comment"></span>
+<a name="l00047"></a>00047 <span class="comment"> /** When completed is true, errorCode contains the errno value of</span>
+<a name="l00048"></a>00048 <span class="comment"> * the last read() call.</span>
+<a name="l00049"></a>00049 <span class="comment"> *</span>
+<a name="l00050"></a>00050 <span class="comment"> * A value of 0 means that no error occured.</span>
+<a name="l00051"></a>00051 <span class="comment"> */</span>
+<a name="l00052"></a>00052 <span class="keywordtype">int</span> errorCode;
+<a name="l00053"></a>00053
+<a name="l00054"></a>00054 PassengerBucketState() {
+<a name="l00055"></a>00055 bytesRead = 0;
+<a name="l00056"></a>00056 completed = <span class="keyword">false</span>;
+<a name="l00057"></a>00057 errorCode = 0;
+<a name="l00058"></a>00058 }
+<a name="l00059"></a>00059 };
+<a name="l00060"></a>00060
+<a name="l00061"></a>00061 <span class="keyword">typedef</span> shared_ptr<PassengerBucketState> PassengerBucketStatePtr;
+<a name="l00062"></a>00062 <span class="comment"></span>
+<a name="l00063"></a>00063 <span class="comment">/**</span>
+<a name="l00064"></a>00064 <span class="comment"> * We used to use an apr_bucket_pipe for forwarding the backend process's</span>
+<a name="l00065"></a>00065 <span class="comment"> * response to the HTTP client. However, apr_bucket_pipe has a number of</span>
+<a name="l00066"></a>00066 <span class="comment"> * issues:</span>
+<a name="l00067"></a>00067 <span class="comment"> * - It closes the pipe's file descriptor when it has reached</span>
+<a name="l00068"></a>00068 <span class="comment"> * end-of-stream, but not when an error has occurred. This behavior is</span>
+<a name="l00069"></a>00069 <span class="comment"> * undesirable because it can easily cause file descriptor leaks.</span>
+<a name="l00070"></a>00070 <span class="comment"> * - It does weird non-blocking-I/O related things which can cause it</span>
+<a name="l00071"></a>00071 <span class="comment"> * to read less data than can actually be read.</span>
+<a name="l00072"></a>00072 <span class="comment"> *</span>
+<a name="l00073"></a>00073 <span class="comment"> * PassengerBucket is like apr_bucket_pipe, but:</span>
+<a name="l00074"></a>00074 <span class="comment"> * - It also holds a reference to a Session. When a read error has occured</span>
+<a name="l00075"></a>00075 <span class="comment"> * or when end-of-stream has been reached, the Session will be</span>
+<a name="l00076"></a>00076 <span class="comment"> * dereferenced, so that the underlying file descriptor is closed.</span>
+<a name="l00077"></a>00077 <span class="comment"> * - It ignores the APR_NONBLOCK_READ flag because that's known to cause</span>
+<a name="l00078"></a>00078 <span class="comment"> * strange I/O problems.</span>
+<a name="l00079"></a>00079 <span class="comment"> * - It can store its current state in a PassengerBucketState data structure.</span>
+<a name="l00080"></a>00080 <span class="comment"> */</span>
+<a name="l00081"></a>00081 apr_bucket *passenger_bucket_create(Passenger::Application::SessionPtr session,
+<a name="l00082"></a>00082 PassengerBucketStatePtr state,
+<a name="l00083"></a>00083 apr_bucket_alloc_t *list);
+<a name="l00084"></a>00084
+<a name="l00085"></a>00085 } <span class="comment">// namespace Passenger</span>
+<a name="l00086"></a>00086
+<a name="l00087"></a>00087 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_BUCKET_H_ */</span>
</pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:37 2009 for Passenger by
+<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 17 13:19:36 2009 for Passenger by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
</body>
</html>