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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines