Skip to content

Commit 20ed000

Browse files
committed
Added a few descriptions and comments.
1 parent 24620b2 commit 20ed000

File tree

10 files changed

+43
-17
lines changed

10 files changed

+43
-17
lines changed

examples/filter/src/database/database_api.e

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ feature -- Access
4646
-- User with id `a_id' or name `a_name'.
4747
require
4848
a_id > 0 xor a_name /= Void
49-
local
50-
n: like {USER}.name
5149
do
5250
if a_id > 0 then
5351
Result := user_by_id (a_id)

library/server/ewsgi/connectors/cgi/src/wgi_cgi_connector.e

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ feature -- Access
2424
feature -- Execution
2525

2626
launch
27+
-- Launch execution of CGI application.
2728
local
2829
req: WGI_REQUEST_FROM_TABLE
2930
res: detachable WGI_RESPONSE_STREAM
@@ -51,6 +52,7 @@ feature -- Execution
5152
end
5253

5354
process_rescue (res: detachable WGI_RESPONSE)
55+
-- Handle rescued execution of current request.
5456
do
5557
if attached (create {EXCEPTION_MANAGER}).last_exception as e and then attached e.trace as l_trace then
5658
if res /= Void then

library/server/ewsgi/connectors/libfcgi/src/wgi_libfcgi_connector.e

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ inherit
2222
feature {NONE} -- Initialization
2323

2424
default_create
25+
-- Create libFCGI connector.
2526
do
2627
Precursor {WGI_CONNECTOR}
2728
create fcgi.make
@@ -40,6 +41,7 @@ feature -- Access
4041
feature -- Server
4142

4243
launch
44+
-- Launch libFCGI server.
4345
local
4446
res: INTEGER
4547
do
@@ -56,6 +58,7 @@ feature -- Server
5658
feature -- Execution
5759

5860
process_fcgi_request (vars: STRING_TABLE [READABLE_STRING_8]; a_input: like input; a_output: like output)
61+
-- Process the request with variables `vars', input `a_input' and output `a_output'.
5962
local
6063
req: WGI_REQUEST_FROM_TABLE
6164
res: detachable WGI_RESPONSE_STREAM
@@ -82,8 +85,9 @@ feature -- Execution
8285
retry
8386
end
8487
end
85-
88+
8689
process_rescue (res: detachable WGI_RESPONSE)
90+
-- Handle rescued execution of current request.
8791
do
8892
if attached (create {EXCEPTION_MANAGER}).last_exception as e and then attached e.trace as l_trace then
8993
if res /= Void then
@@ -116,7 +120,7 @@ invariant
116120
fcgi_attached: fcgi /= Void
117121

118122
note
119-
copyright: "2011-2013, Eiffel Software and others"
123+
copyright: "2011-2015, Eiffel Software and others"
120124
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
121125
source: "[
122126
Eiffel Software

library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_connection_handler.e

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ feature {NONE} -- Initialization
2323
feature -- Access
2424

2525
is_shutdown_requested: BOOLEAN
26+
-- <Precursor>
2627

2728
shutdown_requested (a_server: like server): BOOLEAN
2829
do

library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_connection_handler.e

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,13 @@ feature {HTTPD_SERVER_I} -- Execution
9797
end
9898

9999
process_handler (hdl: separate HTTPD_REQUEST_HANDLER)
100-
-- Process request handler `hdl' with exclusive access.
100+
-- Process request handler `hdl' concurrently.
101101
require
102102
hdl.is_connected
103103
do
104104
hdl.safe_execute
105105
end
106106

107-
separate_client_socket (hdl: separate HTTPD_REQUEST_HANDLER): separate HTTPD_STREAM_SOCKET
108-
-- Separate client socket from a request handler `hdl'.
109-
do
110-
Result := hdl.client_socket
111-
end
112-
113107
feature {HTTPD_SERVER_I} -- Status report
114108

115109
wait_for_completion
@@ -128,6 +122,12 @@ feature {HTTPD_SERVER_I} -- Status report
128122

129123
feature {NONE} -- Implementation
130124

125+
separate_client_socket (hdl: separate HTTPD_REQUEST_HANDLER): separate HTTPD_STREAM_SOCKET
126+
-- Client socket for handler `hdl'.
127+
do
128+
Result := hdl.client_socket
129+
end
130+
131131
pool: separate CONCURRENT_POOL [HTTPD_REQUEST_HANDLER]
132132
-- Pool of separate connection handlers.
133133

library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_request_handler.e

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ inherit
2323
feature {CONCURRENT_POOL, HTTPD_CONNECTION_HANDLER_I} -- Basic operation
2424

2525
release
26+
-- <Precursor>
2627
local
2728
d: STRING
2829
do

library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool.e

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,32 @@ feature {NONE} -- Initialization
2424
feature -- Access
2525

2626
count: INTEGER
27+
-- Number of concurrent items managed by Current pool.
28+
29+
capacity: INTEGER
30+
-- Maximum number of concurrent items managed by Current pool.
31+
32+
feature -- Status report
2733

2834
is_full: BOOLEAN
35+
-- Pool is full?
2936
do
3037
Result := count >= capacity
3138
end
3239

3340
is_empty: BOOLEAN
41+
-- No concurrent item waiting in current pool.
3442
do
3543
Result := count = 0
3644
end
3745

38-
capacity: INTEGER
39-
4046
stop_requested: BOOLEAN
47+
-- Current pool received a request to terminate.
4148

4249
feature -- Access
4350

4451
separate_item (a_factory: separate CONCURRENT_POOL_FACTORY [G]): detachable separate G
52+
-- Reused, or new separate item of type {G} created by `a_factory'.
4553
require
4654
is_not_full: not is_full
4755
local
@@ -94,15 +102,18 @@ feature -- Access
94102
feature -- Basic operation
95103

96104
gracefull_stop
105+
-- Request the Current pool to terminate.
97106
do
98107
stop_requested := True
99108
end
100109

101110
feature {NONE} -- Internal
102111

103112
items: SPECIAL [detachable separate G]
113+
-- List of concurrent items.
104114

105115
busy_items: SPECIAL [BOOLEAN]
116+
-- Map of items being proceed.
106117

107118
feature {CONCURRENT_POOL_ITEM} -- Change
108119

@@ -140,6 +151,7 @@ feature {CONCURRENT_POOL_ITEM} -- Change
140151
feature -- Change
141152

142153
set_count (n: INTEGER)
154+
-- Set capacity of Current pool to `n'.
143155
local
144156
g: detachable separate G
145157
do
@@ -149,6 +161,7 @@ feature -- Change
149161
end
150162

151163
terminate
164+
-- Terminate current pool.
152165
local
153166
l_items: like items
154167
do
@@ -159,6 +172,7 @@ feature -- Change
159172
feature {NONE} -- Implementation
160173

161174
register_item (a_item: separate G)
175+
-- Adopt `a_item' in current pool.
162176
do
163177
a_item.set_pool (Current)
164178
end

library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool_item.e

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ feature {CONCURRENT_POOL} -- Change
2525
feature {CONCURRENT_POOL, HTTPD_CONNECTION_HANDLER_I} -- Basic operation
2626

2727
release
28+
-- Release Current pool item from associated pool.
2829
do
2930
if attached pool as p then
3031
pool_release (p)

library/server/wsf_html/widget/wsf_widget_agent_table.e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ note
55
revision: "$Revision$"
66

77
class
8-
WSF_WIDGET_AGENT_TABLE [G]
8+
WSF_WIDGET_AGENT_TABLE [G -> detachable ANY]
99

1010
inherit
1111
WSF_WIDGET

tests/all-safe.ecf

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="all" uuid="0562209B-4C68-4E77-8B57-13CBF53D05BD" library_target="all">
2+
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="all" uuid="0562209B-4C68-4E77-8B57-13CBF53D05BD" library_target="all">
33
<description>Integration project including many lib</description>
44
<target name="all">
55
<root all_classes="true"/>
@@ -51,14 +51,19 @@
5151
<library name="wsf_cgi" location="..\library\server\wsf\connector\cgi-safe.ecf" readonly="false"/>
5252
<library name="wsf_extension" location="..\library\server\wsf\wsf_extension-safe.ecf" readonly="false"/>
5353
<library name="wsf_html" location="..\library\server\wsf_html\wsf_html-safe.ecf" readonly="false"/>
54+
<library name="wsf_js_widget" location="..\draft\library\server\wsf_js_widget\wsf_js_widget-safe.ecf" readonly="false"/>
55+
<library name="wsf_js_widget_demo" location="..\draft\library\server\wsf_js_widget\examples\demo\demo.ecf" readonly="false"/>
5456
<library name="wsf_libfcgi" location="..\library\server\wsf\connector\libfcgi-safe.ecf" readonly="false"/>
5557
<library name="wsf_nino" location="..\library\server\wsf\connector\nino-safe.ecf" readonly="false"/>
5658
<library name="wsf_openshift" location="..\library\server\wsf\connector\openshift-safe.ecf" readonly="false"/>
5759
<library name="wsf_policy_driven" location="..\library\server\wsf\wsf_policy_driven-safe.ecf" readonly="false"/>
5860
<library name="wsf_router_context" location="..\library\server\wsf\wsf_router_context-safe.ecf" readonly="false"/>
5961
<library name="wsf_session" location="..\library\server\wsf\wsf_session-safe.ecf" readonly="false"/>
60-
<library name="wsf_js_widget" location="..\draft\library\server\wsf_js_widget\wsf_js_widget-safe.ecf" readonly="false"/>
61-
<library name="wsf_js_widget_demo" location="..\draft\library\server\wsf_js_widget\examples\demo\demo.ecf" readonly="false"/>
62+
</target>
63+
<target name="all_scoop" extends="all">
64+
<description>Compiling with SCOOP concurrency</description>
65+
<root all_classes="true"/>
66+
<setting name="concurrency" value="scoop"/>
6267
</target>
6368
<target name="all_windows" extends="all">
6469
<description>Compiling as Windows , on other platforms than Windows</description>

0 commit comments

Comments
 (0)