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.76 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.80 by root, Sun Jun 24 04:09:29 2007 UTC

… …
89void cfperl_init (); 89void cfperl_init ();
90void cfperl_main (); 90void cfperl_main ();
91void cfperl_emergency_save (); 91void cfperl_emergency_save ();
92void cfperl_cleanup (int make_core); 92void cfperl_cleanup (int make_core);
93void cfperl_make_book (object *book, int level); 93void cfperl_make_book (object *book, int level);
94void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
94 95
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 96//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96 97
97// virtual server time, excluding time jumps and lag 98extern tstamp runtime; // virtual server time, excluding time jumps and lag
98extern double runtime; 99extern tstamp NOW; // real time of current server tick
99 100
100enum event_klass 101enum event_klass
101{ 102{
102 KLASS_NONE, 103 KLASS_NONE,
103 KLASS_GLOBAL, 104 KLASS_GLOBAL,
… …
263 264
264 add ('\n'); 265 add ('\n');
265 } 266 }
266 267
267 template<typename T> 268 template<typename T>
268 void put_string (keyword k, const T &v) 269 void put_kw_string (keyword k, const T &v)
269 { 270 {
270 int klen = keyword_len [k]; 271 int klen = keyword_len [k];
271 int vlen = v ? strlen (v) + 1 : 0; 272 int vlen = v ? strlen (v) + 1 : 0;
272 273
273 char *p = (char *)alloc (klen + vlen + 1); 274 char *p = (char *)alloc (klen + vlen + 1);
… …
283 *p = '\n'; 284 *p = '\n';
284 } 285 }
285 286
286 void put (keyword k, const char *v = 0) 287 void put (keyword k, const char *v = 0)
287 { 288 {
288 put_string (k, v); 289 put_kw_string (k, v);
289 } 290 }
290 291
291 void put (keyword k, const shstr &v) 292 void put (keyword k, const shstr &v)
292 { 293 {
293 put_string (k, v); 294 put_kw_string (k, v);
294 } 295 }
295 296
296 void put (keyword k, double v) 297 void put (keyword k, double v)
297 { 298 {
298 force (MAX_KEYWORD_LEN + 2 + 32); 299 force (MAX_KEYWORD_LEN + 2 + 32);
… …
345 346
346 force (MAX_KEYWORD_LEN + 1); 347 force (MAX_KEYWORD_LEN + 1);
347 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 348 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
348 } 349 }
349 350
350 template<typename T> 351 void put (keyword k, archetype *v);
352 void put (keyword k, treasurelist *v);
351 void put (keyword k, const T *v) 353 void put (keyword k, faceinfo *v);
352 {
353 put (k, v ? &v->name : (const char *)0);
354 }
355 354
356 template<typename T> 355 template<typename T>
357 void put (keyword k, const refptr<T> &v) 356 void put (keyword k, const refptr<T> &v)
358 { 357 {
359 put (k, (T *)v); 358 put (k, (T *)v);
… …
427 static struct CoroAPI *GCoroAPI; 426 static struct CoroAPI *GCoroAPI;
428 427
429 static int nready () { return CORO_NREADY; } 428 static int nready () { return CORO_NREADY; }
430 static int cede () { return CORO_CEDE ; } 429 static int cede () { return CORO_CEDE ; }
431 430
432 static double (*time)();
433 static double next_cede; 431 static tstamp next_cede;
434 static int cede_counter; 432 static int cede_counter;
435 433
436 static void do_cede_every (); 434 static void do_cede_every ();
437 static void do_cede_to_tick (); 435 static void do_cede_to_tick ();
438 static void do_cede_to_tick_every (); 436 static void do_cede_to_tick_every ();
… …
441 { 439 {
442 if (expect_false (++cede_counter >= count)) 440 if (expect_false (++cede_counter >= count))
443 do_cede_every (); 441 do_cede_every ();
444 } 442 }
445 443
446 static void cede_to_tick () 444 static bool cede_to_tick ()
447 { 445 {
448 if (expect_false (time () >= next_cede)) 446 if (expect_true (now () < next_cede))
447 return false;
448
449 do_cede_to_tick (); 449 do_cede_to_tick ();
450 return true;
450 } 451 }
451 452
452 static void cede_to_tick_every (int count) 453 static bool cede_to_tick_every (int count)
453 { 454 {
454 if (expect_false (++cede_counter >= count)) 455 if (expect_true (++cede_counter < count))
456 return false;
457
455 cede_to_tick (); 458 return cede_to_tick ();
456 } 459 }
457 460
458 static void wait_for_tick (); 461 static void wait_for_tick ();
459 static void wait_for_tick_begin (); 462 static void wait_for_tick_begin ();
460}; 463};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines