ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 45
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 47
49our %COMMAND = (); 48our %COMMAND = ();
50our %COMMAND_TIME = (); 49our %COMMAND_TIME = ();
51 50
52our @EXTS = (); # list of extension package names 51our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 52our %EXTCMD = ();
53our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
71 72
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 74our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 77our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
79 79
80our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 84our $DB_ENV;
82 85
83our %CFG; 86our %CFG;
84 87
85our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 89our $RUNTIME;
90our $NOW;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
155 159
156The raw value load value from the last tick. 160The raw value load value from the last tick.
157 161
158=item %cf::CFG 162=item %cf::CFG
159 163
160Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 165from wherever your confdir points to.
162 166
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
169=back 179=back
170 180
171=cut 181=cut
172 182
173BEGIN { 183BEGIN {
177 $msg .= "\n" 187 $msg .= "\n"
178 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
179 189
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 191
182 utf8::encode $msg;
183 LOG llevError, $msg; 192 LOG llevError, $msg;
184 }; 193 };
185} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
186 200
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 217)) {
204 no strict 'refs'; 218 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 220}
207 221
208$Event::DIED = sub { 222$EV::DIED = sub {
209 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
210}; 224};
211 225
212############################################################################# 226#############################################################################
213 227
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 251 $d
238 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
239} 253}
240 254
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
244 256
245Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
246 258
247=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
248 260
249Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
262
263=cut
264
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266
267sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) }
250 269
251=item cf::lock_wait $string 270=item cf::lock_wait $string
252 271
253Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
254 273
257Wait until the given lock is available and then acquires it and returns 276Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 277a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
260returned. 279returned.
261 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
262Lock names should begin with a unique identifier (for example, cf::map::find 284Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
264 286
265=item $locked = cf::lock_active $string 287=item $locked = cf::lock_active $string
266 288
267Return true if the lock is currently active, i.e. somebody has locked it. 289Return true if the lock is currently active, i.e. somebody has locked it.
268 290
269=cut 291=cut
270 292
271our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
272 295
273sub lock_wait($) { 296sub lock_wait($) {
274 my ($key) = @_; 297 my ($key) = @_;
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
275 303
276 # wait for lock, if any 304 # wait for lock, if any
277 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 307 Coro::schedule;
285 313
286 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
287 lock_wait $key; 315 lock_wait $key;
288 316
289 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
290 319
291 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
294 } 324 }
295} 325}
296 326
308 }; 338 };
309 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
310 $guard 340 $guard
311} 341}
312 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
358=item cf::get_slot $time[, $priority[, $name]]
359
360Allocate $time seconds of blocking CPU time at priority C<$priority>:
361This call blocks and returns only when you have at least C<$time> seconds
362of cpu time till the next tick. The slot is only valid till the next cede.
363
364The optional C<$name> can be used to identify the job to run. It might be
365used for statistical purposes and should identify the same time-class.
366
367Useful for short background jobs.
368
369=cut
370
371our @SLOT_QUEUE;
372our $SLOT_QUEUE;
373
374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
378 my $signal = new Coro::Signal;
379
380 while () {
381 next_job:
382 my $avail = cf::till_tick;
383 if ($avail > 0.01) {
384 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) {
386 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send;
388 Coro::cede;
389 goto next_job;
390 }
391 }
392 }
393
394 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait;
398 } else {
399 Coro::schedule;
400 }
401 }
402};
403
404sub get_slot($;$$) {
405 my ($time, $pri, $name) = @_;
406
407 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal;
409
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready;
413 $sig->wait;
414}
415
313=item cf::async { BLOCK } 416=item cf::async { BLOCK }
314 417
315Currently the same as Coro::async_pool, meaning you cannot use 418Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 419C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 420thing you are allowed to do is call C<prio> on it.
320 423
321BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
322 425
323=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
324 427
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 429is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 431acceptable.
329 432
330If it must be done, put the blocking parts into C<sync_job>. This will run 433If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
336 439
337sub sync_job(&) { 440sub sync_job(&) {
338 my ($job) = @_; 441 my ($job) = @_;
339 442
340 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 444 my $time = EV::time;
342 445
343 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
345 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
346 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 452 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
349 454
350 my $busy = 1; 455 my $busy = 1;
351 my @res; 456 my @res;
352 457
353 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 460 @res = eval { $job->() };
355 warn $@ if $@; 461 warn $@ if $@;
356 undef $busy; 462 undef $busy;
357 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
358 464
359 while ($busy) { 465 while ($busy) {
360 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
361 } 470 }
471 }
362 472
363 $time = Event::time - $time; 473 $time = EV::time - $time;
364 474
365 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367 477
368 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
398=item fork_call { }, $args 508=item fork_call { }, $args
399 509
400Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
404 514
405=cut 515=cut
406 516
407sub fork_call(&@) { 517sub fork_call(&@) {
408 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
409 519
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 520 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 521 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 522 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 523
415 if (my $pid = fork) { 524 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 525 reset_signals;
428 local $SIG{__WARN__}; 526 &$cb
429 local $SIG{__DIE__}; 527 }, @args;
430 eval {
431 close $fh1;
432 528
433 my @res = eval { $cb->(@args) }; 529 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 530}
441 531
442=item $value = cf::db_get $family => $key 532=item $value = cf::db_get $family => $key
443 533
444Returns a single value from the environment database. 534Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 536=item cf::db_put $family => $key => $value
447 537
448Stores the given C<$value> in the family. It can currently store binary 538Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 540
541=item $db = cf::db_table "name"
542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
451=cut 546=cut
547
548sub db_table($) {
549 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV;
551
552 eval {
553 $db->set_flags (BDB::CHKSUM);
554
555 utf8::encode $name;
556 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
557 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
558 cf::cleanup "db_open(db): $!" if $!;
559 };
560 cf::cleanup "db_open(db): $@" if $@;
561
562 $db
563}
452 564
453our $DB; 565our $DB;
454 566
455sub db_init { 567sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 568 cf::sync_job {
460 eval { 569 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 570 };
470} 571}
471 572
472sub db_get($$) { 573sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 574 my $key = "$_[0]/$_[1]";
474 575
524 if (1) { 625 if (1) {
525 $md5 = 626 $md5 =
526 join "\x00", 627 join "\x00",
527 $processversion, 628 $processversion,
528 map { 629 map {
529 Coro::cede; 630 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 632 } 0.. $#$src;
532 633
533 634
534 my $dbmd5 = db_get cache => "$id/md5"; 635 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
580 681
581In the following description, CLASS can be any of C<global>, C<object> 682In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 683C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 684Deliantra).
584 685
585=over 4 686=over 4
586 687
587=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
588 689
840 "; 941 ";
841 die if $@; 942 die if $@;
842} 943}
843 944
844our $override; 945our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 946our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 947
847sub override { 948sub override {
848 $override = 1; 949 $override = 1;
849 @invoke_results = (); 950 @INVOKE_RESULTS = (@_);
850} 951}
851 952
852sub do_invoke { 953sub do_invoke {
853 my $event = shift; 954 my $event = shift;
854 my $callbacks = shift; 955 my $callbacks = shift;
855 956
856 @invoke_results = (); 957 @INVOKE_RESULTS = ();
857 958
858 local $override; 959 local $override;
859 960
860 for (@$callbacks) { 961 for (@$callbacks) {
861 eval { &{$_->[1]} }; 962 eval { &{$_->[1]} };
870 } 971 }
871 972
872 0 973 0
873} 974}
874 975
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 977
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 979
879Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
880 981
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 982This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 983removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 984results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 985
885=back 986=back
886 987
887=cut 988=cut
888 989
889############################################################################# 990#############################################################################
890# object support 991# object support
992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
1026sub _can_merge {
1027 my ($ob1, $ob2) = @_;
1028
1029 ++$SLOW_MERGES;#d#
1030
1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
1033}
891 1034
892sub reattach { 1035sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1037 my ($obj) = @_;
895 1038
916cf::attachable->attach ( 1059cf::attachable->attach (
917 prio => -1000000, 1060 prio => -1000000,
918 on_instantiate => sub { 1061 on_instantiate => sub {
919 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
920 1063
921 $data = from_json $data; 1064 $data = decode_json $data;
922 1065
923 for (@$data) { 1066 for (@$data) {
924 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
925 1068
926 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1085sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
944 1087
945 sync_job { 1088 sync_job {
946 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
949 1093
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1098 close $fh;
955 1099
956 if (@$objs) { 1100 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1106 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
964 } 1108 }
972 } 1116 }
973 } else { 1117 } else {
974 aio_unlink $filename; 1118 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
976 } 1120 }
977 } 1121 };
978} 1122}
979 1123
980sub object_freezer_as_string { 1124sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
982 1126
994 or return; 1138 or return;
995 1139
996 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
998 or return; 1142 or return;
1143
999 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1000 } 1146 }
1001 1147
1148 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
1004 return ($data, $av); 1152 ($data, $av)
1005} 1153}
1006 1154
1007=head2 COMMAND CALLBACKS 1155=head2 COMMAND CALLBACKS
1008 1156
1009=over 4 1157=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1177 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1178}
1031 1179
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1180=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1181
1034Register a callback fro execution when the client sends an extcmd packet. 1182Register a callback for execution when the client sends an (synchronous)
1183extcmd packet. Ext commands will be processed in the order they are
1184received by the server, like other user commands. The first argument is
1185the logged-in player. Ext commands can only be processed after a player
1186has logged in successfully.
1035 1187
1036If the callback returns something, it is sent back as if reply was being 1188If the callback returns something, it is sent back as if reply was being
1037called. 1189called.
1038 1190
1191=item cf::register_exticmd $name => \&callback($ns,$packet);
1192
1193Register a callback for execution when the client sends an (asynchronous)
1194exticmd packet. Exti commands are processed by the server as soon as they
1195are received, i.e. out of order w.r.t. other commands. The first argument
1196is a client socket. Exti commands can be received anytime, even before
1197log-in.
1198
1199If the callback returns something, it is sent back as if reply was being
1200called.
1201
1039=cut 1202=cut
1040 1203
1041sub register_extcmd { 1204sub register_extcmd {
1042 my ($name, $cb) = @_; 1205 my ($name, $cb) = @_;
1043 1206
1044 $EXTCMD{$name} = $cb; 1207 $EXTCMD{$name} = $cb;
1208}
1209
1210sub register_exticmd {
1211 my ($name, $cb) = @_;
1212
1213 $EXTICMD{$name} = $cb;
1045} 1214}
1046 1215
1047cf::player->attach ( 1216cf::player->attach (
1048 on_command => sub { 1217 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1218 my ($pl, $name, $params) = @_;
1058 cf::override; 1227 cf::override;
1059 }, 1228 },
1060 on_extcmd => sub { 1229 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1230 my ($pl, $buf) = @_;
1062 1231
1063 my $msg = eval { from_json $buf }; 1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1233
1065 if (ref $msg) { 1234 if (ref $msg) {
1235 my ($type, $reply, @payload) =
1236 "ARRAY" eq ref $msg
1237 ? @$msg
1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1239
1240 my @reply;
1241
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1242 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1243 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
1071 } else { 1249 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1251 }
1074 1252
1075 cf::override; 1253 cf::override;
1165 1343
1166=head3 cf::player 1344=head3 cf::player
1167 1345
1168=over 4 1346=over 4
1169 1347
1348=item cf::player::num_playing
1349
1350Returns the official number of playing players, as per the Crossfire metaserver rules.
1351
1352=cut
1353
1354sub num_playing {
1355 scalar grep
1356 $_->ob->map
1357 && !$_->hidden
1358 && !$_->ob->flag (cf::FLAG_WIZ),
1359 cf::player::list
1360}
1361
1170=item cf::player::find $login 1362=item cf::player::find $login
1171 1363
1172Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1173 1365
1174=cut 1366=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1405
1214 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1407 or return;
1408
1409 my $pl = cf::player::load_pl $f
1410 or return;
1411 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1217 } 1414 }
1218 } 1415 }
1219} 1416}
1220 1417
1230 1427
1231 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1233 1430
1234 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1235 Coro::cede; 1432 cf::cede_to_tick;
1236} 1433}
1237 1434
1238sub new($) { 1435sub new($) {
1239 my ($login) = @_; 1436 my ($login) = @_;
1240 1437
1244 $self->{deny_save} = 1; 1441 $self->{deny_save} = 1;
1245 1442
1246 $cf::PLAYER{$login} = $self; 1443 $cf::PLAYER{$login} = $self;
1247 1444
1248 $self 1445 $self
1446}
1447
1448=item $player->send_msg ($channel, $msg, $color, [extra...])
1449
1450=cut
1451
1452sub send_msg {
1453 my $ns = shift->ns
1454 or return;
1455 $ns->send_msg (@_);
1249} 1456}
1250 1457
1251=item $pl->quit_character 1458=item $pl->quit_character
1252 1459
1253Nukes the player without looking back. If logged in, the connection will 1460Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1515 or return [];
1309 1516
1310 my @logins; 1517 my @logins;
1311 1518
1312 for my $login (@$dirs) { 1519 for my $login (@$dirs) {
1520 my $path = path $login;
1521
1522 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1316 1528
1317 utf8::decode $login; 1529 utf8::decode $login;
1318 push @logins, $login; 1530 push @logins, $login;
1319 } 1531 }
1320 1532
1347 } 1559 }
1348 1560
1349 \@paths 1561 \@paths
1350} 1562}
1351 1563
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1565
1566Expand crossfire pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656
1352=item $player->ext_reply ($msgid, %msg) 1657=item $player->ext_reply ($msgid, @msg)
1353 1658
1354Sends an ext reply to the player. 1659Sends an ext reply to the player.
1355 1660
1356=cut 1661=cut
1357 1662
1358sub ext_reply($$%) { 1663sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1664 my ($self, $id, @msg) = @_;
1360 1665
1361 $msg{msgid} = $id; 1666 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1667}
1365 1668
1366=item $player->ext_event ($type, %msg) 1669=item $player->ext_msg ($type, @msg)
1367 1670
1368Sends an ext event to the client. 1671Sends an ext event to the client.
1369 1672
1370=cut 1673=cut
1371 1674
1372sub ext_event($$%) { 1675sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1676 my ($self, $type, @msg) = @_;
1374 1677
1375 $self->ns->ext_event ($type, %msg); 1678 $self->ns->ext_msg ($type, @msg);
1376} 1679}
1377 1680
1378=head3 cf::region 1681=head3 cf::region
1379 1682
1380=over 4 1683=over 4
1393 my ($path) = @_; 1696 my ($path) = @_;
1394 1697
1395 my ($match, $specificity); 1698 my ($match, $specificity);
1396 1699
1397 for my $region (list) { 1700 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1701 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1702 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1703 if $region->specificity > $specificity;
1401 } 1704 }
1402 } 1705 }
1403 1706
1523 $self->init; # pass $1 etc. 1826 $self->init; # pass $1 etc.
1524 return $self; 1827 return $self;
1525 } 1828 }
1526 } 1829 }
1527 1830
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1831 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1832 ()
1530} 1833}
1531 1834
1532sub init { 1835sub init {
1533 my ($self) = @_; 1836 my ($self) = @_;
1596 1899
1597sub load_header_from($) { 1900sub load_header_from($) {
1598 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1599 1902
1600 utf8::encode $path; 1903 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1606 1912
1607 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1608 1914
1609 1 1915 1
1610} 1916}
1664sub find { 1970sub find {
1665 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1666 1972
1667 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1668 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1670 1977
1671 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path"; 1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1673 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1674 or return; 1983 or return;
1675 1984
1676 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1677 1986
1679 or return; 1988 or return;
1680 1989
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1684 $map->reset; 1995 $map->reset;
1685 undef $guard;
1686 return find $path; 1996 return find $path;
1687 } 1997 }
1688 1998
1689 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1690 } 2000 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1700 2010
1701 my $path = $self->{path}; 2011 my $path = $self->{path};
1702 2012
1703 { 2013 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1705 2015
2016 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2018
1708 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1709 2020
1710 $self->alloc; 2021 $self->alloc;
1711 2022
1712 $self->pre_load; 2023 $self->pre_load;
1713 Coro::cede; 2024 cf::cede_to_tick;
1714 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1716 or return; 2029 or return;
1717 2030
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1720 2033
1721 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2035 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2038 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1726 } 2042 }
1727 } 2043 }
1728 2044
1729 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1730 # now do the right thing for maps 2048 # now do the right thing for maps
1731 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2051 unless $self->difficulty;
1734 Coro::cede; 2052 cf::cede_to_tick;
1735 2053
1736 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2055 $self->decay_objects;
1738 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1739 $self->update_buttons; 2057 $self->update_buttons;
1740 Coro::cede; 2058 cf::cede_to_tick;
1741 $self->set_darkness_map; 2059 $self->set_darkness_map;
1742 Coro::cede; 2060 cf::cede_to_tick;
1743 $self->activate; 2061 $self->activate;
1744 } 2062 }
2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
1745 2066
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 2068 }
1748 2069
1749 $self->post_load; 2070 $self->post_load;
1760 2081
1761 $self 2082 $self
1762} 2083}
1763 2084
1764# find and load all maps in the 3x3 area around a map 2085# find and load all maps in the 3x3 area around a map
1765sub load_diag { 2086sub load_neighbours {
1766 my ($map) = @_; 2087 my ($map) = @_;
1767 2088
1768 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1769 2090
1770 for (0 .. 3) { 2091 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1772 or next; 2093 or next;
1773 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1774 or next; 2095 or next;
1775 $neigh->load; 2096 $neigh->load;
1776 2097
2098 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2101 }
1780 2102
1781 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1783 or next; 2106 or next;
1784 $neigh->load; 2107 $neigh->load;
1785 } 2108 }
1786} 2109}
1787 2110
1792} 2115}
1793 2116
1794sub do_load_sync { 2117sub do_load_sync {
1795 my ($map) = @_; 2118 my ($map) = @_;
1796 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1797 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1798} 2124}
1799 2125
1800our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1802 2128
1803sub find_async { 2129sub find_async {
1804 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1805 2131
1806 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1807 2133
1808 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 2136 }
1811 2137
1812 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1813 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1814 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2145 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2146 $map->load if $v;
2147 }
1819 2148
1820 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1821 } 2150 }
1822 } 2151 }
1823 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1824 }; 2153 };
1825 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
1828} 2157}
1829 2158
1830sub save { 2159sub save {
1831 my ($self) = @_; 2160 my ($self) = @_;
1832 2161
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2163
1835 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1836 2165
1837 return unless $self->dirty; 2166 return unless $self->dirty;
1838 2167
1844 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1845 2174
1846 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1847 2176
1848 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
1850 }; 2180 };
1851 2181
1852 if ($uniq) { 2182 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1861 my ($self) = @_; 2191 my ($self) = @_;
1862 2192
1863 # save first because save cedes 2193 # save first because save cedes
1864 $self->save; 2194 $self->save;
1865 2195
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2197
1868 return if $self->players; 2198 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2200 return if $self->{deny_save};
1871 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2206 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2207}
1875 2208
1876sub reset_at { 2209sub reset_at {
1877 my ($self) = @_; 2210 my ($self) = @_;
1878 2211
1910 if $uniq; 2243 if $uniq;
1911 } 2244 }
1912 2245
1913 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1914 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2250 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2251
1919 $self->unlink_save; 2252 $self->unlink_save;
1920 $self->destroy; 2253 $self->destroy;
1921} 2254}
1922 2255
1923my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
1924 2257
1925sub nuke { 2258sub nuke {
1926 my ($self) = @_; 2259 my ($self) = @_;
1927 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
1928 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
1929 2265
1930 $self->unlink_save; 2266 $self->unlink_save;
1931 2267
1932 bless $self, "cf::map"; 2268 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2273
1938 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
1939 2276
1940 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
1941} 2278}
1942 2279
1943=item $maps = cf::map::tmp_maps 2280=item $maps = cf::map::tmp_maps
2019 2356
2020sub inv_recursive { 2357sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2022} 2359}
2023 2360
2361=item $ref = $ob->ref
2362
2363creates and returns a persistent reference to an objetc that can be stored as a string.
2364
2365=item $ob = cf::object::deref ($refstring)
2366
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block.
2369
2370=cut
2371
2372sub deref {
2373 my ($ref) = @_;
2374
2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2376 my ($uuid, $name) = ($1, $2);
2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2378 or return;
2379 $pl->ob->uuid eq $uuid
2380 or return;
2381
2382 $pl->ob
2383 } else {
2384 warn "$ref: cannot resolve object reference\n";
2385 undef
2386 }
2387}
2388
2024package cf; 2389package cf;
2025 2390
2026=back 2391=back
2027 2392
2028=head3 cf::object::player 2393=head3 cf::object::player
2045 2410
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2411 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2412
2048 if ($self->{record_replies}) { 2413 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2414 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2415
2050 } else { 2416 } else {
2417 my $pl = $self->contr;
2418
2419 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2420 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422
2423 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2424 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2425 $self->message ($msg, $flags);
2426 }
2053 } 2427 }
2428}
2429
2430=item $object->send_msg ($channel, $msg, $color, [extra...])
2431
2432=cut
2433
2434sub cf::object::send_msg {
2435 my $pl = shift->contr
2436 or return;
2437 $pl->send_msg (@_);
2054} 2438}
2055 2439
2056=item $player_object->may ("access") 2440=item $player_object->may ("access")
2057 2441
2058Returns wether the given player is authorized to access resource "access" 2442Returns wether the given player is authorized to access resource "access"
2137 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2138 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2139 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2140 2524
2141 $map->load; 2525 $map->load;
2142 $map->load_diag; 2526 $map->load_neighbours;
2143 2527
2144 return unless $self->contr->active; 2528 return unless $self->contr->active;
2145 $self->activate_recursive; 2529 $self->activate_recursive;
2146 2530
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2149} 2533}
2150 2534
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2536
2153Moves the player to the given map-path and coordinates by first freezing 2537Moves the player to the given map-path and coordinates by first freezing
2154her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2155that has to return the map if sucecssful, and then unfreezes the player on 2539that has to return the map if sucecssful, and then unfreezes the player on
2156the new (success) or old (failed) map position. 2540the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process.
2157 2542
2158=cut 2543=cut
2159 2544
2160our $GOTOGEN; 2545our $GOTOGEN;
2161 2546
2162sub cf::object::player::goto { 2547sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2549
2165 # do generation counting so two concurrent goto's will be executed in-order 2550 # do generation counting so two concurrent goto's will be executed in-order
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2552
2168 $self->enter_link; 2553 $self->enter_link;
2169 2554
2170 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2171 my $map = eval { 2577 my $map = eval {
2172 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2173 2579
2174 if ($map) { 2580 if ($map) {
2175 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2176 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2177 } else { 2583 } else {
2178 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2179 } 2585 }
2180 2586
2181 $map 2587 $map
2182 }; 2588 };
2183 2589
2188 2594
2189 if ($gen == $self->{_goto_generation}) { 2595 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2596 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
2192 } 2598 }
2599
2600 $done->() if $done;
2193 })->prio (1); 2601 })->prio (1);
2194} 2602}
2195 2603
2196=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
2197 2605
2234 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2235 } 2643 }
2236 2644
2237 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2238 2646
2239 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2240 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2241 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2242 2650
2243 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2244 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2266 my $hp = $exit->stats->hp; 2674 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2675 my $sp = $exit->stats->sp;
2268 2676
2269 $self->enter_link; 2677 $self->enter_link;
2270 2678
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2271 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2272 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2687 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2275 2689
2276 1; 2690 1;
2302 2716
2303 utf8::encode $text; 2717 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2719}
2306 2720
2721=item $client->send_msg ($channel, $msg, $color, [extra...])
2722
2723Send a drawinfo or msg packet to the client, formatting the msg for the
2724client if neccessary. C<$type> should be a string identifying the type of
2725the message, with C<log> being the default. If C<$color> is negative, suppress
2726the message unless the client supports the msg packet.
2727
2728=cut
2729
2730# non-persistent channels (usually the info channel)
2731our %CHANNEL = (
2732 "c/identify" => {
2733 id => "infobox",
2734 title => "Identify",
2735 reply => undef,
2736 tooltip => "Items recently identified",
2737 },
2738 "c/examine" => {
2739 id => "infobox",
2740 title => "Examine",
2741 reply => undef,
2742 tooltip => "Signs and other items you examined",
2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2780);
2781
2782sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_;
2784
2785 $msg = $self->pl->expand_cfpod ($msg);
2786
2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788
2789 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2798 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804 }
2805
2806 $channel = $channel->{id};
2807 }
2808
2809 return unless @extra || length $msg;
2810
2811 if ($self->can_msg) {
2812 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF;
2815
2816 $self->send_packet ("msg " . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2818 } else {
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829
2830 $color &= cf::NDI_COLOR_MASK;
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843}
2844
2307=item $client->ext_event ($type, %msg) 2845=item $client->ext_msg ($type, @msg)
2308 2846
2309Sends an exti event to the client. 2847Sends an ext event to the client.
2310 2848
2311=cut 2849=cut
2312 2850
2313sub cf::client::ext_event($$%) { 2851sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2852 my ($self, $type, @msg) = @_;
2315 2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2857 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 }
2860}
2861
2862=item $client->ext_reply ($msgid, @msg)
2863
2864Sends an ext reply to the client.
2865
2866=cut
2867
2868sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_;
2870
2871 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 }
2318} 2878}
2319 2879
2320=item $success = $client->query ($flags, "text", \&cb) 2880=item $success = $client->query ($flags, "text", \&cb)
2321 2881
2322Queues a query to the client, calling the given callback with 2882Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2883the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2884C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2885
2326Queries can fail, so check the return code. Or don't, as queries will become 2886Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2887become reliable at some point in the future.
2328 2888
2329=cut 2889=cut
2330 2890
2331sub cf::client::query { 2891sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2892 my ($self, $flags, $text, $cb) = @_;
2340 utf8::encode $text; 2900 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2901 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2902
2343 $self->send_packet ($self->{query_queue}[0][0]) 2903 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2904 if @{ $self->{query_queue} } == 1;
2905
2906 1
2345} 2907}
2346 2908
2347cf::client->attach ( 2909cf::client->attach (
2910 on_connect => sub {
2911 my ($ns) = @_;
2912
2913 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2914 },
2348 on_reply => sub { 2915 on_reply => sub {
2349 my ($ns, $msg) = @_; 2916 my ($ns, $msg) = @_;
2350 2917
2351 # this weird shuffling is so that direct followup queries 2918 # this weird shuffling is so that direct followup queries
2352 # get handled first 2919 # get handled first
2364 } else { 2931 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2932 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2933 }
2367 } 2934 }
2368 }, 2935 },
2936 on_exticmd => sub {
2937 my ($ns, $buf) = @_;
2938
2939 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2940
2941 if (ref $msg) {
2942 my ($type, $reply, @payload) =
2943 "ARRAY" eq ref $msg
2944 ? @$msg
2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2946
2947 my @reply;
2948
2949 if (my $cb = $EXTICMD{$type}) {
2950 @reply = $cb->($ns, @payload);
2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2956 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 }
2959
2960 cf::override;
2961 },
2369); 2962);
2370 2963
2371=item $client->async (\&cb) 2964=item $client->async (\&cb)
2372 2965
2373Create a new coroutine, running the specified callback. The coroutine will 2966Create a new coroutine, running the specified callback. The coroutine will
2414our $safe = new Safe "safe"; 3007our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 3008our $safe_hole = new Safe::Hole;
2416 3009
2417$SIG{FPE} = 'IGNORE'; 3010$SIG{FPE} = 'IGNORE';
2418 3011
2419$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3012$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math
3014 grepstart grepwhile mapstart mapwhile
3015 sort time
3016));
2420 3017
2421# here we export the classes and methods available to script code 3018# here we export the classes and methods available to script code
2422 3019
2423=pod 3020=pod
2424 3021
2425The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2426 3023
2427 cf::object contr pay_amount pay_player map 3024 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr
3027
2428 cf::object::player player 3028 cf::object::player
2429 cf::player peaceful 3029 player
2430 cf::map trigger 3030
3031 cf::player
3032 peaceful
3033
3034 cf::map
3035 trigger
2431 3036
2432=cut 3037=cut
2433 3038
2434for ( 3039for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race
3042 decrease_ob_nr destroy)],
2436 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2439) { 3046) {
2440 no strict 'refs'; 3047 no strict 'refs';
2516# the server's init and main functions 3123# the server's init and main functions
2517 3124
2518sub load_facedata($) { 3125sub load_facedata($) {
2519 my ($path) = @_; 3126 my ($path) = @_;
2520 3127
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133
2521 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2522 3135
2523 my $facedata; 3136 my $facedata;
2524 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
2525 or die "$path: $!"; 3138 or die "$path: $!";
2527 $facedata = Coro::Storable::thaw $facedata; 3140 $facedata = Coro::Storable::thaw $facedata;
2528 3141
2529 $facedata->{version} == 2 3142 $facedata->{version} == 2
2530 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2531 3144
3145 # patch in the exptable
3146 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3149 };
3150 cf::cede_to_tick;
3151
2532 { 3152 {
2533 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2534 3154
2535 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540 Coro::cede; 3162
3163 cf::cede_to_tick;
2541 } 3164 }
2542 3165
2543 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2545 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2546 or next; 3170 or next;
3171
2547 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 3175 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 3177 }
2552 Coro::cede; 3178
3179 cf::cede_to_tick;
2553 } 3180 }
2554 } 3181 }
2555 3182
2556 { 3183 {
2557 my $anims = $facedata->{animinfo}; 3184 my $anims = $facedata->{animinfo};
2558 3185
2559 while (my ($anim, $info) = each %$anims) { 3186 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3187 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 3188 cf::cede_to_tick;
2562 } 3189 }
2563 3190
2564 cf::anim::invalidate_all; # d'oh 3191 cf::anim::invalidate_all; # d'oh
2565 } 3192 }
2566 3193
3194 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource};
3198
3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203
3204 if ($info->{type} & 1) {
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
3219 } else {
3220 $RESOURCE{$name} = $info;
3221 }
3222
3223 cf::cede_to_tick;
3224 }
3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228
2567 1 3229 1
2568} 3230}
2569 3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251
3252register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_;
3254
3255 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v);
3257 }
3258};
3259
2570sub reload_regions { 3260sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = ();
3264
2571 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 3266 or die "unable to load regions file\n";
3267
3268 for (cf::region::list) {
3269 $_->{match} = qr/$_->{match}/
3270 if exists $_->{match};
3271 }
2573} 3272}
2574 3273
2575sub reload_facedata { 3274sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 3275 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 3276 or die "unable to load facedata\n";
2578} 3277}
2579 3278
2580sub reload_archetypes { 3279sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 3285 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 3286 or die "unable to load archetypes\n";
2583} 3287}
2584 3288
2585sub reload_treasures { 3289sub reload_treasures {
2601 3305
2602sub init { 3306sub init {
2603 reload_resources; 3307 reload_resources;
2604} 3308}
2605 3309
2606sub cfg_load { 3310sub reload_config {
2607 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2608 or return; 3312 or return;
2609 3313
2610 local $/; 3314 local $/;
2611 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2612 3316
2613 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2614 3318
2615 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2616 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2627sub main { 3331sub main {
2628 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
2629 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
2630 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2631 (async { 3335 (async {
2632 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
2633 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
2634 }; 3339 };
2635 3340
2636 cfg_load; 3341 reload_config;
2637 db_init; 3342 db_init;
2638 load_extensions; 3343 load_extensions;
2639 3344
2640 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2641 Event::loop; 3347 EV::loop;
2642} 3348}
2643 3349
2644############################################################################# 3350#############################################################################
2645# initialisation and cleanup 3351# initialisation and cleanup
2646 3352
2647# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
2648BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
2649 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
2650 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2651 reentrant => 0,
2652 data => WF_AUTOCANCEL,
2653 signal => $signal,
2654 prio => 0,
2655 cb => sub {
2656 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
2657 },
2658 ); 3359 };
2659 } 3360 }
2660} 3361}
2661 3362
2662sub write_runtime { 3363sub write_runtime {
2663 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
2708 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
2710 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3415 $pl->save;
2714 } 3416 }
2715 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
2716 3418
2717 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
2756 warn "syncing database to disk"; 3458 warn "syncing database to disk";
2757 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
2758 3460
2759 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
2760 3462
2761 warn "cancelling all WF_AUTOCANCEL watchers";
2762 for (Event::all_watchers) {
2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2764 }
2765
2766 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
2767 for (;;) { 3464 for (;;) {
2768 BDB::flush; 3465 BDB::flush;
2769 IO::AIO::flush; 3466 IO::AIO::flush;
2770 Coro::cede; 3467 Coro::cede_notself;
2771 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
2772 warn "iterate..."; 3469 warn "iterate...";
2773 } 3470 }
2774 3471
2775 ++$RELOAD; 3472 ++$RELOAD;
2779 %EXT_CORO = (); 3476 %EXT_CORO = ();
2780 3477
2781 warn "removing commands"; 3478 warn "removing commands";
2782 %COMMAND = (); 3479 %COMMAND = ();
2783 3480
2784 warn "removing ext commands"; 3481 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3482 %EXTCMD = ();
3483 %EXTICMD = ();
2786 3484
2787 warn "unloading/nuking all extensions"; 3485 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3486 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3487 warn "... unloading $pkg";
2790 3488
2833 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
2834 require cf; 3532 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3534
2837 warn "loading config and database again"; 3535 warn "loading config and database again";
2838 cf::cfg_load; 3536 cf::reload_config;
2839 3537
2840 warn "loading extensions"; 3538 warn "loading extensions";
2841 cf::load_extensions; 3539 cf::load_extensions;
2842 3540
2843 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
2863 3561
2864sub reload_perl() { 3562sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
2867 3565
2868 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2869 reentrant => 0,
2870 after => 0,
2871 data => WF_AUTOCANCEL,
2872 cb => sub {
2873 do_reload_perl;
2874 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
2875 }, 3568 do_reload_perl;
2876 ); 3569 };
2877} 3570}
2878 3571
2879register_command "reload" => sub { 3572register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
2881 3574
2882 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3579 reload_perl;
3580 };
2885 } 3581 }
2886}; 3582};
2887 3583
2888unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
2889 3585
2908 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3606 $signal->wait;
2911} 3607}
2912 3608
2913 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer (
2916 reentrant => 0,
2917 parked => 1,
2918 prio => 0,
2919 at => $NEXT_TICK || $TICK,
2920 data => WF_AUTOCANCEL,
2921 cb => sub {
2922 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2924 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
2925 return; 3613 return;
2926 } 3614 }
2927 3615
2928 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
2929 3617
2930 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
2931 3619
2932 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
2933 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937 3622
2938 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2939 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2940 $map->alloc; 3625 Coro::async_pool {
2941 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
2942 my $t = Event::time - $t; 3627 write_runtime
2943 3628 or warn "ERROR: unable to write runtime file: $!";
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 }; 3629 };
3630 }
2954 3631
2955 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK;
2957
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3633 $sig->send;
2971 } 3634 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3636 $sig->send;
2974 } 3637 }
2975 3638
2976 $NOW = Event::time;
2977
2978 # if we are delayed by four ticks or more, skip them all
2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2980
2981 $TICK_WATCHER->at ($NEXT_TICK);
2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3641
2987 _post_tick; 3642 _post_tick;
2988 3643};
2989 3644$TICK_WATCHER->priority (EV::MAXPRI);
2990 },
2991);
2992 3645
2993{ 3646{
2994 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
2995 $BDB_POLL_WATCHER = Event->io ( 3648
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3004 3650 BDB::max_poll_reqs $TICK * 0.1;
3005 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019 3652
3020 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3659
3023 cf::sync_job { 3660 cf::sync_job {
3024 eval { 3661 eval {
3025 BDB::db_env_open 3662 BDB::db_env_open
3026 $DB_ENV, 3663 $DB_ENV,
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3667 0666;
3031 3668
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3670 };
3037 3671
3038 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3673 };
3040 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3041} 3685}
3042 3686
3043{ 3687{
3688 # configure IO::AIO
3689
3044 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
3047 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3048 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno,
3052 poll => 'r',
3053 prio => 6,
3054 cb => \&IO::AIO::poll_cb,
3055 );
3056} 3693}
3057 3694
3058my $_log_backtrace; 3695my $_log_backtrace;
3059 3696
3060sub _log_backtrace { 3697sub _log_backtrace {
3064 3701
3065 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3704 ++$_log_backtrace;
3068 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3069 my @bt = fork_call { 3708 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines