diff options
author | Dr Scofield | 2008-06-25 13:10:12 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-25 13:10:12 +0000 |
commit | daca971bf6de2020be00c6f0641494bd481bd091 (patch) | |
tree | 463c4f1f00907c6d83217b99397a0e1db763bb69 /OpenSim/Framework/Servers/OSHttpRequestPump.cs | |
parent | taking another look at mantis #1502: adding necessary locks, checking for emp... (diff) | |
download | opensim-SC-daca971bf6de2020be00c6f0641494bd481bd091.zip opensim-SC-daca971bf6de2020be00c6f0641494bd481bd091.tar.gz opensim-SC-daca971bf6de2020be00c6f0641494bd481bd091.tar.bz2 opensim-SC-daca971bf6de2020be00c6f0641494bd481bd091.tar.xz |
further work on the HttpServer stuff. not functional yet. just sharing
what crimes i'm committing.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpRequestPump.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs index 8a3e73f..06e41e4 100644 --- a/OpenSim/Framework/Servers/OSHttpRequestPump.cs +++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs | |||
@@ -31,25 +31,28 @@ using HttpServer; | |||
31 | namespace OpenSim.Framework.Servers | 31 | namespace OpenSim.Framework.Servers |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// OSHttpServer provides an HTTP server bound to a specific | 34 | /// An OSHttpRequestPump fetches incoming OSHttpRequest objects |
35 | /// port. When instantiated with just address and port it uses | 35 | /// from the OSHttpRequestQueue and feeds them to all subscribed |
36 | /// normal HTTP, when instantiated with address, port, and X509 | 36 | /// parties. Each OSHttpRequestPump encapsulates one thread to do |
37 | /// certificate, it uses HTTPS. | 37 | /// the work and there is a fixed number of pumps for each |
38 | /// OSHttpServer object. | ||
38 | /// </summary> | 39 | /// </summary> |
39 | public class OSHttpRequestPump | 40 | public class OSHttpRequestPump |
40 | { | 41 | { |
41 | protected OSHttpServer _httpServer; | 42 | protected OSHttpServer _server; |
43 | protected OSHttpRequestQueue _queue; | ||
42 | 44 | ||
43 | public OSHttpRequestPump() | 45 | public OSHttpRequestPump() |
44 | { | 46 | { |
45 | } | 47 | } |
46 | 48 | ||
47 | public static OSHttpRequestPump[] Pumps(OSHttpServer server, int poolSize) | 49 | public static OSHttpRequestPump[] Pumps(OSHttpServer server, OSHttpRequestQueue queue, int poolSize) |
48 | { | 50 | { |
49 | OSHttpRequestPump[] pumps = new OSHttpRequestPump[poolSize]; | 51 | OSHttpRequestPump[] pumps = new OSHttpRequestPump[poolSize]; |
50 | for (int i = 0; i < pumps.Length; i++) | 52 | for (int i = 0; i < pumps.Length; i++) |
51 | { | 53 | { |
52 | pumps[i]._httpServer = server; | 54 | pumps[i]._server = server; |
55 | pumps[i]._queue = queue; | ||
53 | } | 56 | } |
54 | 57 | ||
55 | return pumps; | 58 | return pumps; |