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.62 by root, Tue Apr 17 10:06:33 2007 UTC vs.
Revision 1.88 by root, Thu Aug 30 07:28:25 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22 */
23
1// 24//
2// cfperl.h perl interface 25// cfperl.h perl interface
3// 26//
4#ifndef CFPERL_H__ 27#ifndef CFPERL_H__
5#define CFPERL_H__ 28#define CFPERL_H__
6 29
30#include <cstdarg>
7#include <cstdio> 31#include <cstdio>
32#include <bitset>
8 33
9using namespace std; 34using namespace std;
10 35
11#include <EXTERN.h> 36#include <EXTERN.h>
12#include <perl.h> 37#include <perl.h>
… …
30#undef readdir 55#undef readdir
31#undef getprotobyname 56#undef getprotobyname
32#undef gethostbyname 57#undef gethostbyname
33#undef ctime 58#undef ctime
34#undef strerror 59#undef strerror
60#undef _
35 61
36// same here, massive symbol spamming 62// same here, massive symbol spamming
37#undef do_open 63#undef do_open
38#undef do_close 64#undef do_close
39#undef ref 65#undef ref
… …
44#undef random 70#undef random
45#undef crypt 71#undef crypt
46 72
47////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 73//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
48 74
75#define _(msg) (msg)
76#define N_(msg) (msg)
77
78//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
79
49// some macros to simplify perl in-calls 80// some macros to simplify perl in-calls
50 81
51#define CHECK_ERROR \ 82#define CHECK_ERROR \
52 if (SvTRUE (ERRSV)) \ 83 if (SvTRUE (ERRSV)) \
53 LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV)); 84 LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV));
… …
62 93
63void cfperl_init (); 94void cfperl_init ();
64void cfperl_main (); 95void cfperl_main ();
65void cfperl_emergency_save (); 96void cfperl_emergency_save ();
66void cfperl_cleanup (int make_core); 97void cfperl_cleanup (int make_core);
98void cfperl_make_book (object *book, int level);
99void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
100int cfperl_can_merge (object *ob1, object *ob2);
67 101
68////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 102//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
69 103
70// virtual server time, excluding time jumps and lag 104extern tstamp runtime; // virtual server time, excluding time jumps and lag
71extern double runtime; 105extern tstamp NOW; // real time of current server tick
72 106
73enum event_klass 107enum event_klass
74{ 108{
75 KLASS_NONE, 109 KLASS_NONE,
76 KLASS_GLOBAL, 110 KLASS_GLOBAL,
… …
87# define def(klass,name) EVENT_ ## klass ## _ ## name, 121# define def(klass,name) EVENT_ ## klass ## _ ## name,
88# include "eventinc.h" 122# include "eventinc.h"
89# undef def 123# undef def
90 NUM_EVENT_TYPES 124 NUM_EVENT_TYPES
91}; 125};
126
127// in which global events or per-type events are we interested
128extern bitset<NUM_EVENT_TYPES> ev_want_event;
129extern bitset<NUM_TYPES> ev_want_type;
92 130
93#define ARG_AV(o) DT_AV , static_cast<AV *> (o) 131#define ARG_AV(o) DT_AV , static_cast<AV *> (o)
94#define ARG_INT(v) DT_INT , static_cast<int> (v) 132#define ARG_INT(v) DT_INT , static_cast<int> (v)
95#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v) 133#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v)
96#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v) 134#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
… …
103#define ARG_CLIENT(o) DT_CLIENT, (void *)(static_cast<client *> (o)) 141#define ARG_CLIENT(o) DT_CLIENT, (void *)(static_cast<client *> (o))
104#define ARG_PARTY(o) DT_PARTY , (void *)(static_cast<party *> (o)) 142#define ARG_PARTY(o) DT_PARTY , (void *)(static_cast<party *> (o))
105#define ARG_REGION(o) DT_REGION, (void *)(static_cast<region *> (o)) 143#define ARG_REGION(o) DT_REGION, (void *)(static_cast<region *> (o))
106 144
107// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension 145// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
108 146#define INVOKE(obj,event, ...) (expect_false ((obj)->should_invoke (event)) ? (obj)->invoke (event, ## __VA_ARGS__, DT_END) : 0)
109// all these return true when the normal event processing should be skipped (if any)
110#define INVOKE_GLOBAL(event, ...) gbl_ev.invoke (EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__, DT_END) 147#define INVOKE_GLOBAL(event, ...) INVOKE (&gbl_ev, EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__)
111#define INVOKE_ATTACHABLE(event, obj, ...) (obj)->invoke (EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__, DT_END) 148#define INVOKE_ATTACHABLE(event, obj, ...) INVOKE (obj , EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__)
112#define INVOKE_OBJECT(event, obj, ...) (obj)->invoke (EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__, DT_END) 149#define INVOKE_OBJECT(event, obj, ...) INVOKE (obj , EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__)
113#define INVOKE_CLIENT(event, obj, ...) (obj)->invoke (EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__, DT_END) 150#define INVOKE_CLIENT(event, obj, ...) INVOKE (obj , EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__)
114#define INVOKE_PLAYER(event, obj, ...) (obj)->invoke (EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__, DT_END) 151#define INVOKE_PLAYER(event, obj, ...) INVOKE (obj , EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__)
115#define INVOKE_MAP(event, obj, ...) (obj)->invoke (EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__, DT_END) 152#define INVOKE_MAP(event, obj, ...) INVOKE (obj , EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__)
116 153
117//TODO should index into @result 154//TODO should index into @result
118#define RESULT(idx,type) cfperl_result_ ## type (idx) 155#define RESULT(idx,type) cfperl_result_ ## type (idx)
119#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE) 156#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE)
120#define RESULT_INT(idx) RESULT(idx, INT) 157#define RESULT_INT(idx) RESULT(idx, INT)
… …
123int cfperl_result_INT (int idx); 160int cfperl_result_INT (int idx);
124 161
125////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 162//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
126 163
127INTERFACE_CLASS (attachable) 164INTERFACE_CLASS (attachable)
128struct attachable 165struct attachable : refcnt_base
129{ 166{
130 static MGVTBL vtbl; 167 static MGVTBL vtbl;
131 168
132 static unordered_vector<attachable *> mortals; 169 static unordered_vector<attachable *> mortals;
133 MTH static void check_mortals (); 170 MTH static void check_mortals ();
134 171
135 enum { 172 enum {
136 F_DESTROYED = 0x01, 173 F_DESTROYED = 0x01,
137 F_DEBUG_TRACE = 0x02, 174 F_DEBUG_TRACE = 0x02,
138 }; 175 };
176 int ACC (RW, flags);
139 177
140 // object is delete'd after the refcount reaches 0 178 // object is delete'd after the refcount reaches 0
141 int ACC (RW, flags);
142 mutable int ACC (RW, refcnt);
143
144 MTH void refcnt_inc () const { ++refcnt; }
145 MTH void refcnt_dec () const { --refcnt; }
146
147 MTH int refcnt_cnt () const; 179 MTH int refcnt_cnt () const;
148 // check wether the object has died and destroy 180 // check wether the object has died and destroy
149 MTH void refcnt_chk () { if (refcnt <= 0) do_check (); } 181 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
150 182
151 // destroy the object unless it was already destroyed 183 // destroy the object unless it was already destroyed
152 // this politely asks everybody interested the reduce 184 // this politely asks everybody interested the reduce
153 // the refcount to 0 as soon as possible. 185 // the refcount to 0 as soon as possible.
154 MTH void destroy (); 186 MTH void destroy ();
… …
170 202
171 void sever_self (); // sever this object from its self, if it has one. 203 void sever_self (); // sever this object from its self, if it has one.
172 void optimise (); // possibly save some memory by destroying unneeded data 204 void optimise (); // possibly save some memory by destroying unneeded data
173 205
174 attachable () 206 attachable ()
175 : flags (0), refcnt (0), self (0), cb (0), attach (0) 207 : flags (0), self (0), cb (0), attach (0)
176 { 208 {
177 } 209 }
178 210
179 attachable (const attachable &src) 211 attachable (const attachable &src)
180 : flags (0), refcnt (0), self (0), cb (0), attach (src.attach) 212 : flags (0), self (0), cb (0), attach (src.attach)
181 { 213 {
182 } 214 }
183 215
184 virtual ~attachable (); 216 // set a custom key to the given value, or delete it if value = 0
217 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
218
219 void set_key_text (const char *key, const char *value = 0)
220 {
221 set_key (key, value, 1);
222 }
223
224 void set_key_data (const char *key, const char *value = 0)
225 {
226 set_key (key, value, 0);
227 }
185 228
186 attachable &operator =(const attachable &src); 229 attachable &operator =(const attachable &src);
187 230
231 // used to _quickly_ device wether to shortcut the evaluation
232 bool should_invoke (event_type event)
233 {
234 return ev_want_event [event] || cb;
235 }
236
188 bool invoke (event_type event, ...); 237 bool invoke (event_type event, ...);
238
189 MTH void instantiate (); 239 MTH void instantiate ();
190 void reattach (); 240 void reattach ();
191 241
192protected: 242protected:
193 // do the real refcount checking work 243 // do the real refcount checking work
194 void do_check (); 244 void do_check ();
195 245
196 // the method that does the real destroy work 246 // the method that does the real destroy work
197 virtual void do_destroy (); 247 virtual void do_destroy ();
248
249 // destructor is protected, should not be called by anybody
250 virtual ~attachable ();
198}; 251};
199 252
200// the global object is a pseudo object that cares for the global events 253// the global object is a pseudo object that cares for the global events
201struct global : attachable 254struct global : attachable
202{ 255{
… …
205 258
206extern struct global gbl_ev; 259extern struct global gbl_ev;
207 260
208////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 261//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
209 262
210struct object_freezer : dynbuf 263struct object_freezer : dynbuf_text
211{ 264{
212 AV *av; 265 AV *av;
213 266
214 object_freezer (); 267 object_freezer ();
215 ~object_freezer (); 268 ~object_freezer ();
… …
219 // used only for user-defined key-value pairs 272 // used only for user-defined key-value pairs
220 void put (const shstr &k, const shstr &v) 273 void put (const shstr &k, const shstr &v)
221 { 274 {
222 add (k); 275 add (k);
223 276
224 if (v) 277 if (expect_true (v))
225 add (' '), add (v); 278 add (' '), add (v);
226 279
227 add ('\n'); 280 add ('\n');
228 } 281 }
229 282
230 //TODO//temporary, used only for saving body locations
231 void put (const char *k, int v)
232 {
233 add (k);
234 add (' ');
235 add (sint32 (v));
236 add ('\n');
237 }
238
239 template<typename T> 283 template<typename T>
240 void put_string (keyword k, const T &v) 284 void put_kw_string (keyword k, const T &v)
241 { 285 {
242 int klen = keyword_len [k]; 286 int klen = keyword_len [k];
243 int vlen = v ? strlen (v) + 1 : 0; 287 int vlen = v ? strlen (v) + 1 : 0;
244 288
245 char *p = (char *)alloc (klen + vlen + 1); 289 char *p = (char *)alloc (klen + vlen + 1);
246 290
247 memcpy (p, keyword_str [k], klen); p += klen; 291 memcpy (p, keyword_str [k], klen); p += klen;
248 292
249 if (v) 293 if (expect_true (v))
250 { 294 {
251 *p++ = ' '; vlen--; 295 *p++ = ' '; vlen--;
252 memcpy (p, v, vlen); p += vlen; 296 memcpy (p, v, vlen); p += vlen;
253 } 297 }
254 298
255 *p = '\n'; 299 *p = '\n';
256 } 300 }
257 301
258 void put (keyword k, const char *v = 0) 302 void put (keyword k, const char *v = 0)
259 { 303 {
260 put_string (k, v); 304 put_kw_string (k, v);
261 } 305 }
262 306
263 void put (keyword k, const shstr &v) 307 void put (keyword k, const shstr &v)
264 { 308 {
265 put_string (k, v); 309 put_kw_string (k, v);
266 } 310 }
267 311
268 void put (keyword k, double v) 312 void put (keyword k, double v)
269 { 313 {
270 char buf [128]; 314 force (MAX_KEYWORD_LEN + 2 + 32);
271 315 fadd (keyword_str [k], keyword_len [k]);
272 snprintf (buf, 128, "%.7g", v); 316 fadd (' ');
273 317 falloc (sprintf (ptr, "%.7g", v));
274 put (k, (const char *)buf); 318 fadd ('\n');
275 } 319 }
276 320
277 void put_(keyword k, sint64 v) 321 void put_(keyword k, sint64 v)
278 { 322 {
323 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
279 add (keyword_str [k], keyword_len [k]); 324 fadd (keyword_str [k], keyword_len [k]);
280 add (' '); 325 fadd (' ');
281 add (v); 326 add (v);
282 add ('\n'); 327 fadd ('\n');
283 } 328 }
284 329
285 void put_(keyword k, sint32 v) 330 void put_(keyword k, sint32 v)
286 { 331 {
332 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
287 add (keyword_str [k], keyword_len [k]); 333 fadd (keyword_str [k], keyword_len [k]);
288 add (' '); 334 fadd (' ');
289 add (v); 335 add (v);
290 add ('\n'); 336 fadd ('\n');
291 }
292
293 void put (keyword kbeg, keyword kend, const shstr &v)
294 {
295 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
296
297 if (v)
298 {
299 add (v);
300 add ('\n');
301 }
302
303 add (keyword_str [kend], keyword_len [kend]); add ('\n');
304 } 337 }
305 338
306 void put (keyword k, float v) { put (k, (double)v); } 339 void put (keyword k, float v) { put (k, (double)v); }
307 void put (keyword k, signed char v) { put_(k, (sint32)v); } 340 void put (keyword k, signed char v) { put_(k, (sint32)v); }
308 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 341 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
… …
313 void put (keyword k, signed long v) { put_(k, (sint64)v); } 346 void put (keyword k, signed long v) { put_(k, (sint64)v); }
314 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 347 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
315 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 348 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
316 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 349 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
317 350
318 template<typename T> 351 void put (keyword kbeg, keyword kend, const shstr &v)
352 {
353 force (MAX_KEYWORD_LEN + 1);
354 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
355
356 if (expect_true (v))
357 {
358 add (v);
359 add ('\n');
360 }
361
362 force (MAX_KEYWORD_LEN + 1);
363 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
364 }
365
366 void put (keyword k, archetype *v);
367 void put (keyword k, treasurelist *v);
319 void put (keyword k, const T *v) 368 void put (keyword k, faceinfo *v);
320 {
321 if (v)
322 put (k, v->name);
323 else
324 put (k, (const char *)0);
325 }
326 369
327 template<typename T> 370 template<typename T>
328 void put (keyword k, const refptr<T> &v) 371 void put (keyword k, const refptr<T> &v)
329 { 372 {
330 put (k, (T *)v); 373 put (k, (T *)v);
… …
334 char *as_string (); // like strdup 377 char *as_string (); // like strdup
335 378
336 operator bool () { return !!av; } 379 operator bool () { return !!av; }
337}; 380};
338 381
339// compatibility support, should be removed when no longer needed
340void fprintf (object_freezer &freezer, const char *format, ...);
341void fputs (const char *s, object_freezer &freezer);
342
343struct object_thawer 382struct object_thawer
344{ 383{
384 char *line; // current beginning of line
345 SV *text; // text part 385 SV *text; // text part
346 AV *av; // perl part 386 AV *av; // perl part
347 int linenum; 387 int linenum;
348 char *line; // current beginning of line
349 keyword kw; 388 keyword kw;
350 char *kw_str, *value; 389 char *kw_str; // the keyword parsed, as string
390 char *value; // the value, or 0 if no value
391 char *value_nn; // the value, or the empty string if no value
351 const char *name; 392 const char *name;
352 393
353 operator bool () { return !!text; } 394 operator bool () { return !!text; }
354 395
355 object_thawer (const char *path = 0); 396 object_thawer (const char *path = 0);
… …
359 void get (attachable *obj, int oid); 400 void get (attachable *obj, int oid);
360 401
361 // parse next line 402 // parse next line
362 void next (); 403 void next ();
363 // skip the current key-value (usually fetch next line, for 404 // skip the current key-value (usually fetch next line, for
364 // multiline-fields, skips untilt he corresponding end-kw 405 // multiline-fields, skips till the corresponding end-kw
365 void skip (); 406 void skip ();
366 407
367 //TODO: remove, deprecated
368 keyword get_kv ()
369 {
370 next ();
371 return kw;
372 }
373
374 char *get_str () { return value; } // may be 0 408 char *get_str () { return value; } // may be 0
409 void get_ml (keyword kend, shstr &sh);
375 410
376 void get (shstr &sh) const;
377 void get_ornull (shstr &sh) const { sh = value; } 411 void get_ornull (shstr &sh) const { sh = value; }
378 void get_ml (keyword kend, shstr &sh); 412 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
379 413
414 bool get_bool () const { return *value_nn == '1'; }
380 sint32 get_sint32 () const; 415 sint32 get_sint32 () const;
381 sint64 get_sint64 () const; 416 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
382 double get_double () const; 417 double get_double () const { return strtod (value_nn, 0); }
383 418
384 void get (float &v) { v = get_double (); } 419 void get (float &v) { v = get_double (); }
385 void get (double &v) { v = get_double (); } 420 void get (double &v) { v = get_double (); }
386 421
387 void get (bool &i) { i = get_sint32 (); } 422 void get (bool &i) { i = get_bool (); }
388 void get (sint8 &i) { i = get_sint32 (); } 423 void get (sint8 &i) { i = get_sint32 (); }
389 void get (uint8 &i) { i = get_sint32 (); } 424 void get (uint8 &i) { i = get_sint32 (); }
390 void get (sint16 &i) { i = get_sint32 (); } 425 void get (sint16 &i) { i = get_sint32 (); }
391 void get (uint16 &i) { i = get_sint32 (); } 426 void get (uint16 &i) { i = get_sint32 (); }
392 void get (sint32 &i) { i = get_sint32 (); } 427 void get (sint32 &i) { i = get_sint32 (); }
393 428
394 void get (uint32 &i) { i = get_sint64 (); } 429 void get (uint32 &i) { i = get_sint64 (); }
395 void get (sint64 &i) { i = get_sint64 (); } 430 void get (sint64 &i) { i = get_sint64 (); }
396 431
432 void parse_warn (const char *msg);
397 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 433 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
398}; 434};
399 435
400//TODO: remove 436//TODO: remove
401char *fgets (char *s, int n, object_thawer &thawer); 437char *fgets (char *s, int n, object_thawer &thawer);
… …
406 static struct CoroAPI *GCoroAPI; 442 static struct CoroAPI *GCoroAPI;
407 443
408 static int nready () { return CORO_NREADY; } 444 static int nready () { return CORO_NREADY; }
409 static int cede () { return CORO_CEDE ; } 445 static int cede () { return CORO_CEDE ; }
410 446
411 static double (*time)();
412 static double next_cede; 447 static tstamp next_cede;
413 static int cede_counter; 448 static int cede_counter;
414 449
415 static void do_cede_every (); 450 static void do_cede_every ();
416 static void do_cede_to_tick (); 451 static void do_cede_to_tick ();
417 static void do_cede_to_tick_every (); 452 static void do_cede_to_tick_every ();
418 453
419 static void cede_every (int count) 454 static void cede_every (int count)
420 { 455 {
421 if (++cede_counter >= count) 456 if (expect_false (++cede_counter >= count))
422 do_cede_every (); 457 do_cede_every ();
423 } 458 }
424 459
425 static void cede_to_tick () 460 static bool cede_to_tick ()
426 { 461 {
427 if (time () >= next_cede) 462 if (expect_true (now () < next_cede))
463 return false;
464
428 do_cede_to_tick (); 465 do_cede_to_tick ();
466 return true;
429 } 467 }
430 468
431 static void cede_to_tick_every (int count) 469 static bool cede_to_tick_every (int count)
432 { 470 {
433 if (++cede_counter >= count) 471 if (expect_true (++cede_counter < count))
472 return false;
473
434 cede_to_tick (); 474 return cede_to_tick ();
435 } 475 }
436 476
437 static void wait_for_tick (); 477 static void wait_for_tick ();
438 static void wait_for_tick_begin (); 478 static void wait_for_tick_begin ();
439}; 479};

Diff Legend

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