Changeset 2525
- Timestamp:
- 08/30/07 01:46:35 (1 year ago)
- Files:
-
- trunk/example/conduits/FileBucket.d (modified) (1 diff)
- trunk/example/networking/selector.d (modified) (1 diff)
- trunk/tango/io/Buffer.d (modified) (2 diffs)
- trunk/tango/io/Conduit.d (modified) (3 diffs)
- trunk/tango/io/DeviceConduit.d (modified) (2 diffs)
- trunk/tango/io/MemoryConduit.d (modified) (1 diff)
- trunk/tango/io/model/IBuffer.d (modified) (1 diff)
- trunk/tango/io/model/IConduit.d (modified) (2 diffs)
- trunk/tango/net/Socket.d (modified) (2 diffs)
- trunk/tango/net/SocketConduit.d (modified) (1 diff)
- trunk/tango/net/cluster/tina/Cluster.d (modified) (1 diff)
- trunk/tango/net/cluster/tina/ClusterThread.d (modified) (1 diff)
- trunk/tango/net/cluster/tina/QueueFile.d (modified) (1 diff)
- trunk/tango/net/ftp/FtpClient.d (modified) (6 diffs)
- trunk/tango/net/ftp/Telnet.d (modified) (1 diff)
- trunk/tango/net/http/HttpClient.d (modified) (1 diff)
- trunk/tango/text/convert/Integer.d (modified) (1 diff)
- trunk/tango/util/log/FileAppender.d (modified) (1 diff)
- trunk/tango/util/log/SocketAppender.d (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/example/conduits/FileBucket.d
r2497 r2525 222 222 if (file) 223 223 { 224 file.d isconnect;224 file.detach; 225 225 file = null; 226 226 map = null; trunk/example/networking/selector.d
r2497 r2525 278 278 } 279 279 280 serverSocket.socket().d isconnect;280 serverSocket.socket().detach; 281 281 } 282 282 catch (SelectorException e) trunk/tango/io/Buffer.d
r2499 r2525 1204 1204 1205 1205 Remarks: 1206 Close flushes & commits itself, and d isconnects any1207 associatedconduit.1206 Close flushes & commits itself, and detaches any associated 1207 conduit. 1208 1208 1209 1209 ***********************************************************************/ … … 1215 1215 flush; 1216 1216 commit; 1217 sink.conduit.d isconnect;1217 sink.conduit.detach; 1218 1218 } 1219 1219 } trunk/tango/io/Conduit.d
r2505 r2525 91 91 ***********************************************************************/ 92 92 93 abstract void d isconnect();93 abstract void detach (); 94 94 95 95 /*********************************************************************** … … 156 156 157 157 Remarks: 158 Close flushes & commits any filters before d isconnecting159 theconduit158 Close flushes & commits any filters before detaching the 159 conduit 160 160 161 161 ***********************************************************************/ … … 165 165 sink.flush; 166 166 sink.commit; 167 this.d isconnect;167 this.detach; 168 168 } 169 169 trunk/tango/io/DeviceConduit.d
r2505 r2525 100 100 ***************************************************************/ 101 101 102 override void d isconnect()102 override void detach () 103 103 { 104 104 if (handle) … … 192 192 ***************************************************************/ 193 193 194 override void d isconnect()194 override void detach () 195 195 { 196 196 if (handle) trunk/tango/io/MemoryConduit.d
r2497 r2525 112 112 ***********************************************************************/ 113 113 114 override void d isconnect() {}114 override void detach () {} 115 115 } 116 116 trunk/tango/io/model/IBuffer.d
r2498 r2525 619 619 620 620 Remarks: 621 Close flushes & commits itself, and d isconnects any622 associatedconduit.621 Close flushes & commits itself, and detaches any associated 622 conduit. 623 623 624 624 ***********************************************************************/ trunk/tango/io/model/IConduit.d
r2505 r2525 98 98 ***********************************************************************/ 99 99 100 abstract void d isconnect();100 abstract void detach (); 101 101 102 102 /*********************************************************************** … … 105 105 106 106 Remarks: 107 Close flushes & commits any filters before d isconnecting108 theconduit107 Close flushes & commits any filters before detaching the 108 conduit 109 109 110 110 ***********************************************************************/ trunk/tango/net/Socket.d
r2520 r2525 720 720 { 721 721 if (this.sock) 722 this.d isconnect;722 this.detach; 723 723 724 724 if (sock is sock.init) … … 1021 1021 ***********************************************************************/ 1022 1022 1023 void d isconnect()1023 void detach () 1024 1024 { 1025 1025 if (sock != sock.init) trunk/tango/net/SocketConduit.d
r2497 r2525 213 213 ***********************************************************************/ 214 214 215 override void d isconnect()216 { 217 socket_.d isconnect;215 override void detach () 216 { 217 socket_.detach; 218 218 219 219 // deallocate if this came from the free-list, trunk/tango/net/cluster/tina/Cluster.d
r2497 r2525 1090 1090 final void close () 1091 1091 { 1092 conduit_.d isconnect;1092 conduit_.detach; 1093 1093 } 1094 1094 trunk/tango/net/cluster/tina/ClusterThread.d
r2497 r2525 142 142 143 143 // make sure we close the conduit 144 buffer.conduit.d isconnect;144 buffer.conduit.detach; 145 145 } 146 146 } trunk/tango/net/cluster/tina/QueueFile.d
r2505 r2525 146 146 { 147 147 if (conduit) 148 conduit.d isconnect;148 conduit.detach; 149 149 conduit = null; 150 150 } trunk/tango/net/ftp/FtpClient.d
r2497 r2525 285 285 // Shutdown the socket... 286 286 this.socket.shutdown(SocketShutdown.BOTH); 287 this.socket.d isconnect();287 this.socket.detach(); 288 288 289 289 // Clear out everything. … … 492 492 // Close the socket, whether we were listening or not. 493 493 data.shutdown(SocketShutdown.BOTH); 494 data.d isconnect();494 data.detach(); 495 495 } 496 496 … … 519 519 // Close the socket. This tells the server we're done (EOF.) 520 520 data.shutdown(SocketShutdown.BOTH); 521 data.d isconnect();521 data.detach(); 522 522 523 523 // We shouldn't get a 250 in STREAM mode. … … 635 635 // We don't need the listener anymore. 636 636 data.shutdown(SocketShutdown.BOTH); 637 data.d isconnect();637 data.detach(); 638 638 639 639 // This is the actual socket. … … 753 753 scope (exit) 754 754 { 755 file.d isconnect();755 file.detach(); 756 756 delete file; 757 757 } … … 900 900 scope (exit) 901 901 { 902 file.d isconnect();902 file.detach(); 903 903 delete file; 904 904 } trunk/tango/net/ftp/Telnet.d
r2497 r2525 228 228 { 229 229 s.shutdown(SocketShutdown.BOTH); 230 s.d isconnect();230 s.detach(); 231 231 232 232 delete s; trunk/tango/net/http/HttpClient.d
r2497 r2525 270 270 { 271 271 socket.shutdown; 272 socket.d isconnect;272 socket.detach; 273 273 socket = null; 274 274 } trunk/tango/text/convert/Integer.d
r2509 r2525 416 416 417 417 default: 418 --p; 418 419 break; 419 420 } trunk/tango/util/log/FileAppender.d
r2497 r2525 143 143 if (conduit_) 144 144 { 145 conduit_.d isconnect;145 conduit_.detach; 146 146 conduit_ = null; 147 147 } trunk/tango/util/log/SocketAppender.d
r2497 r2525 121 121 { 122 122 if (buffer) 123 buffer.conduit.d isconnect;123 buffer.conduit.detach; 124 124 buffer = null; 125 125 }












