Index: branches/wmf/1.17wmf1/extensions/PoolCounter/PoolCounterClient_body.php |
— | — | @@ -29,9 +29,11 @@ |
30 | 30 | if ( count( $parts ) < 2 ) { |
31 | 31 | $parts[] = 7531; |
32 | 32 | } |
| 33 | + wfProfileIn( __METHOD__.'-connect' ); |
33 | 34 | wfSuppressWarnings(); |
34 | 35 | $conn = fsockopen( $parts[0], $parts[1], $errno, $errstr, $this->timeout ); |
35 | 36 | wfRestoreWarnings(); |
| 37 | + wfProfileOut( __METHOD__.'-connect' ); |
36 | 38 | if ( $conn ) { |
37 | 39 | break; |
38 | 40 | } |
— | — | @@ -122,20 +124,28 @@ |
123 | 125 | } |
124 | 126 | |
125 | 127 | function acquireForMe() { |
126 | | - return $this->sendCommand( 'ACQ4ME', $this->key, $this->workers, $this->maxqueue, $this->timeout ); |
| 128 | + wfProfileIn( __METHOD__ ); |
| 129 | + $status = $this->sendCommand( 'ACQ4ME', $this->key, $this->workers, $this->maxqueue, $this->timeout ); |
| 130 | + wfProfileOut( __METHOD__ ); |
| 131 | + return $status; |
127 | 132 | } |
128 | 133 | |
129 | 134 | function acquireForAnyone() { |
130 | | - return $this->sendCommand( 'ACQ4ANY', $this->key, $this->workers, $this->maxqueue, $this->timeout ); |
| 135 | + wfProfileIn( __METHOD__ ); |
| 136 | + $status = $this->sendCommand( 'ACQ4ANY', $this->key, $this->workers, $this->maxqueue, $this->timeout ); |
| 137 | + wfProfileOut( __METHOD__ ); |
| 138 | + return $status; |
131 | 139 | } |
132 | 140 | |
133 | 141 | function release() { |
| 142 | + wfProfileIn( __METHOD__ ); |
134 | 143 | $status = $this->sendCommand( 'RELEASE', $this->key ); |
135 | 144 | |
136 | 145 | if ( $this->conn ) { |
137 | 146 | self::$manager->close( $this->conn ); |
138 | 147 | $this->conn = null; |
139 | 148 | } |
| 149 | + wfProfileOut( __METHOD__ ); |
140 | 150 | return $status; |
141 | 151 | } |
142 | 152 | } |
Property changes on: branches/wmf/1.17wmf1/extensions/PoolCounter/PoolCounterClient_body.php |
___________________________________________________________________ |
Added: svn:mergeinfo |
143 | 153 | Merged /branches/REL1_15/phase3/extensions/PoolCounter/PoolCounterClient_body.php:r51646 |
144 | 154 | Merged /branches/wmf/1.16wmf4/extensions/PoolCounter/PoolCounterClient_body.php:r67177,69199,76243,77266 |
145 | 155 | Merged /trunk/extensions/PoolCounter/PoolCounterClient_body.php:r84214 |
146 | 156 | Merged /branches/sqlite/extensions/PoolCounter/PoolCounterClient_body.php:r58211-58321 |
147 | 157 | Merged /trunk/phase3/extensions/PoolCounter/PoolCounterClient_body.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83590 |
148 | 158 | Merged /branches/new-installer/phase3/extensions/PoolCounter/PoolCounterClient_body.php:r43664-66004 |
149 | 159 | Merged /branches/wmf-deployment/extensions/PoolCounter/PoolCounterClient_body.php:r60970 |