ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/cfperl.h
(Generate patch)

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.74 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.78 by root, Wed Jun 6 05:41:26 2007 UTC

174 MTH void refcnt_inc () const { ++refcnt; } 174 MTH void refcnt_inc () const { ++refcnt; }
175 MTH void refcnt_dec () const { --refcnt; } 175 MTH void refcnt_dec () const { --refcnt; }
176 176
177 MTH int refcnt_cnt () const; 177 MTH int refcnt_cnt () const;
178 // check wether the object has died and destroy 178 // check wether the object has died and destroy
179 MTH void refcnt_chk () { if (refcnt <= 0) do_check (); } 179 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
180 180
181 // destroy the object unless it was already destroyed 181 // destroy the object unless it was already destroyed
182 // this politely asks everybody interested the reduce 182 // this politely asks everybody interested the reduce
183 // the refcount to 0 as soon as possible. 183 // the refcount to 0 as soon as possible.
184 MTH void destroy (); 184 MTH void destroy ();
263 263
264 add ('\n'); 264 add ('\n');
265 } 265 }
266 266
267 template<typename T> 267 template<typename T>
268 void put_string (keyword k, const T &v) 268 void put_kw_string (keyword k, const T &v)
269 { 269 {
270 int klen = keyword_len [k]; 270 int klen = keyword_len [k];
271 int vlen = v ? strlen (v) + 1 : 0; 271 int vlen = v ? strlen (v) + 1 : 0;
272 272
273 char *p = (char *)alloc (klen + vlen + 1); 273 char *p = (char *)alloc (klen + vlen + 1);
283 *p = '\n'; 283 *p = '\n';
284 } 284 }
285 285
286 void put (keyword k, const char *v = 0) 286 void put (keyword k, const char *v = 0)
287 { 287 {
288 put_string (k, v); 288 put_kw_string (k, v);
289 } 289 }
290 290
291 void put (keyword k, const shstr &v) 291 void put (keyword k, const shstr &v)
292 { 292 {
293 put_string (k, v); 293 put_kw_string (k, v);
294 } 294 }
295 295
296 void put (keyword k, double v) 296 void put (keyword k, double v)
297 { 297 {
298 force (MAX_KEYWORD_LEN + 2 + 32); 298 force (MAX_KEYWORD_LEN + 2 + 32);
345 345
346 force (MAX_KEYWORD_LEN + 1); 346 force (MAX_KEYWORD_LEN + 1);
347 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 347 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
348 } 348 }
349 349
350 template<typename T> 350 void put (keyword k, archetype *v);
351 void put (keyword k, treasurelist *v);
351 void put (keyword k, const T *v) 352 void put (keyword k, faceinfo *v);
352 {
353 if (v)
354 put (k, v->name);
355 else
356 put (k, (const char *)0);
357 }
358 353
359 template<typename T> 354 template<typename T>
360 void put (keyword k, const refptr<T> &v) 355 void put (keyword k, const refptr<T> &v)
361 { 356 {
362 put (k, (T *)v); 357 put (k, (T *)v);
444 { 439 {
445 if (expect_false (++cede_counter >= count)) 440 if (expect_false (++cede_counter >= count))
446 do_cede_every (); 441 do_cede_every ();
447 } 442 }
448 443
449 static void cede_to_tick () 444 static bool cede_to_tick ()
450 { 445 {
451 if (expect_false (time () >= next_cede)) 446 if (expect_true (time () < next_cede))
447 return false;
448
452 do_cede_to_tick (); 449 do_cede_to_tick ();
450 return true;
453 } 451 }
454 452
455 static void cede_to_tick_every (int count) 453 static bool cede_to_tick_every (int count)
456 { 454 {
457 if (expect_false (++cede_counter >= count)) 455 if (expect_true (++cede_counter < count))
456 return false;
457
458 cede_to_tick (); 458 return cede_to_tick ();
459 } 459 }
460 460
461 static void wait_for_tick (); 461 static void wait_for_tick ();
462 static void wait_for_tick_begin (); 462 static void wait_for_tick_begin ();
463}; 463};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines