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.279 by root, Mon Jun 11 22:16:53 2007 UTC vs.
Revision 1.397 by root, Mon Nov 19 15:47:14 2007 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;
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.1 ();
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::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::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 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 42
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# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
44 45
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 47
49our %COMMAND = (); 50our %COMMAND = ();
50our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
51 52
52our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
56 58
57our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
58our @EVENT; 60our @EVENT;
76our $NEXT_TICK; 78our $NEXT_TICK;
77our $NOW; 79our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
79 81
80our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 86our $DB_ENV;
82 87
83our %CFG; 88our %CFG;
84 89
85our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 91our $RUNTIME;
87 92
88our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
91 96
92# used to convert map paths into valid unix filenames by replacing / by ∕ 97# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 99
155 160
156The raw value load value from the last tick. 161The raw value load value from the last tick.
157 162
158=item %cf::CFG 163=item %cf::CFG
159 164
160Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 166from wherever your confdir points to.
162 167
163=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
164 169
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These 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 171returns 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. 172per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 173
174=item @cf::INVOKE_RESULTS
175
176This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call.
179
169=back 180=back
170 181
171=cut 182=cut
172 183
173BEGIN { 184BEGIN {
177 $msg .= "\n" 188 $msg .= "\n"
178 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
179 190
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 192
182 utf8::encode $msg;
183 LOG llevError, $msg; 193 LOG llevError, $msg;
184 }; 194 };
185} 195}
186 196
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
203)) { 213)) {
204 no strict 'refs'; 214 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 216}
207 217
208$Event::DIED = sub { 218$EV::DIED = sub {
209 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
210}; 220};
221
222#############################################################################
211 223
212=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
213 225
214=over 4 226=over 4
215 227
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 247 $d
236 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
237} 249}
238 250
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
242 252
243Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
244 254
245=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
246 256
247Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
248 265
249=item cf::lock_wait $string 266=item cf::lock_wait $string
250 267
251Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
252 269
255Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
258returned. 275returned.
259 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
260Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
262 282
263=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
264 284
265Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
266 286
267=cut 287=cut
268 288
269our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
270 291
271sub lock_wait($) { 292sub lock_wait($) {
272 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
273 299
274 # wait for lock, if any 300 # wait for lock, if any
275 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 303 Coro::schedule;
283 309
284 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
285 lock_wait $key; 311 lock_wait $key;
286 312
287 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
288 315
289 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
292 } 320 }
293} 321}
294 322
306 }; 334 };
307 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
308 $guard 336 $guard
309} 337}
310 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
354=item cf::get_slot $time[, $priority[, $name]]
355
356Allocate $time seconds of blocking CPU time at priority C<$priority>:
357This call blocks and returns only when you have at least C<$time> seconds
358of cpu time till the next tick. The slot is only valid till the next cede.
359
360The optional C<$name> can be used to identify the job to run. It might be
361used for statistical purposes and should identify the same time-class.
362
363Useful for short background jobs.
364
365=cut
366
367our @SLOT_QUEUE;
368our $SLOT_QUEUE;
369
370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
374 my $signal = new Coro::Signal;
375
376 while () {
377 next_job:
378 my $avail = cf::till_tick;
379 if ($avail > 0.01) {
380 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) {
382 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send;
384 Coro::cede;
385 goto next_job;
386 }
387 }
388 }
389
390 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait;
394 } else {
395 Coro::schedule;
396 }
397 }
398};
399
400sub get_slot($;$$) {
401 my ($time, $pri, $name) = @_;
402
403 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal;
405
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready;
409 $sig->wait;
410}
411
311=item cf::async { BLOCK } 412=item cf::async { BLOCK }
312 413
313Currently the same as Coro::async_pool, meaning you cannot use 414Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 415C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 416thing you are allowed to do is call C<prio> on it.
318 419
319BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
320 421
321=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
322 423
323The design of crossfire+ requires that the main coro ($Coro::main) is 424The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 425is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
427acceptable.
326 428
327If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 431server will be frozen during this time, so the block should either finish
330fast or be very important. 432fast or be very important.
333 435
334sub sync_job(&) { 436sub sync_job(&) {
335 my ($job) = @_; 437 my ($job) = @_;
336 438
337 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 440 my $time = EV::time;
339 441
340 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
342 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
343 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 448 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
346 450
347 my $busy = 1; 451 my $busy = 1;
348 my @res; 452 my @res;
349 453
350 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 456 @res = eval { $job->() };
352 warn $@ if $@; 457 warn $@ if $@;
353 undef $busy; 458 undef $busy;
354 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
355 460
356 while ($busy) { 461 while ($busy) {
357 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
358 } 466 }
467 }
359 468
360 $time = Event::time - $time; 469 $time = EV::time - $time;
361 470
362 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364 473
365 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
390 $EXT_CORO{$coro+0} = $coro; 499 $EXT_CORO{$coro+0} = $coro;
391 500
392 $coro 501 $coro
393} 502}
394 503
395sub write_runtime { 504=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 505
398 # first touch the runtime file to show we are still running: 506Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 507process, returning the results. Everything must be serialisable with
508Coro::Storable. May, of course, block. Note that the executed sub may
509never block itself or use any form of event handling.
400 510
401 IO::AIO::aio_utime $runtime, undef, undef; 511=cut
402 512
403 my $guard = cf::lock_acquire "write_runtime"; 513sub fork_call(&@) {
514 my ($cb, @args) = @_;
404 515
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 516 # we seemingly have to make a local copy of the whole thing,
406 or return; 517 # otherwise perl prematurely frees the stuff :/
518 # TODO: investigate and fix (likely this will be rather laborious)
407 519
408 my $value = $cf::RUNTIME + 90 + 10; 520 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 521 reset_signals;
410 # 60 allows for the watchdog to kill the server. 522 &$cb
523 }, @args;
411 524
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 525 wantarray ? @res : $res[-1]
413 and return; 526}
414 527
415 # always fsync - this file is important 528=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 529
419 # touch it again to show we are up-to-date 530Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 531
422 close $fh 532=item cf::db_put $family => $key => $value
423 or return;
424 533
425 aio_rename "$runtime~", $runtime 534Stores the given C<$value> in the family. It can currently store binary
426 and return; 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 536
428 warn "runtime file written.\n"; 537=item $db = cf::db_table "name"
429 538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
560
561our $DB;
562
563sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db";
566 };
567}
568
569sub db_get($$) {
570 my $key = "$_[0]/$_[1]";
571
572 cf::sync_job {
573 BDB::db_get $DB, undef, $key, my $data;
574
575 $! ? ()
576 : $data
430 1 577 }
578}
579
580sub db_put($$$) {
581 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
583}
584
585=item cf::cache $id => [$paths...], $processversion => $process
586
587Generic caching function that returns the value of the resource $id,
588caching and regenerating as required.
589
590This function can block.
591
592=cut
593
594sub cache {
595 my ($id, $src, $processversion, $process) = @_;
596
597 my $meta =
598 join "\x00",
599 $processversion,
600 map {
601 aio_stat $_
602 and Carp::croak "$_: $!";
603
604 ($_, (stat _)[7,9])
605 } @$src;
606
607 my $dbmeta = db_get cache => "$id/meta";
608 if ($dbmeta ne $meta) {
609 # changed, we may need to process
610
611 my @data;
612 my $md5;
613
614 for (0 .. $#$src) {
615 0 <= aio_load $src->[$_], $data[$_]
616 or Carp::croak "$src->[$_]: $!";
617 }
618
619 # if processing is expensive, check
620 # checksum first
621 if (1) {
622 $md5 =
623 join "\x00",
624 $processversion,
625 map {
626 cf::cede_to_tick;
627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
628 } 0.. $#$src;
629
630
631 my $dbmd5 = db_get cache => "$id/md5";
632 if ($dbmd5 eq $md5) {
633 db_put cache => "$id/meta", $meta;
634
635 return db_get cache => "$id/data";
636 }
637 }
638
639 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time;
642
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
644
645 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta;
648
649 return $data;
650 }
651
652 db_get cache => "$id/data"
431} 653}
432 654
433=item cf::datalog type => key => value, ... 655=item cf::datalog type => key => value, ...
434 656
435Log a datalog packet of the given type with the given key-value pairs. 657Log a datalog packet of the given type with the given key-value pairs.
453attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
455 677
456In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 680Deliantra).
459 681
460=over 4 682=over 4
461 683
462=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
463 685
665 _attach $registry, $klass, @attach; 887 _attach $registry, $klass, @attach;
666 } 888 }
667 889
668 $obj->{$name} = \%arg; 890 $obj->{$name} = \%arg;
669 } else { 891 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 892 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 893 }
672 894
673 $obj->{_attachment}{$name} = undef; 895 $obj->{_attachment}{$name} = undef;
674} 896}
675 897
715 "; 937 ";
716 die if $@; 938 die if $@;
717} 939}
718 940
719our $override; 941our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 942our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 943
722sub override { 944sub override {
723 $override = 1; 945 $override = 1;
724 @invoke_results = (); 946 @INVOKE_RESULTS = (@_);
725} 947}
726 948
727sub do_invoke { 949sub do_invoke {
728 my $event = shift; 950 my $event = shift;
729 my $callbacks = shift; 951 my $callbacks = shift;
730 952
731 @invoke_results = (); 953 @INVOKE_RESULTS = ();
732 954
733 local $override; 955 local $override;
734 956
735 for (@$callbacks) { 957 for (@$callbacks) {
736 eval { &{$_->[1]} }; 958 eval { &{$_->[1]} };
753 975
754Generate an object-specific event with the given arguments. 976Generate an object-specific event with the given arguments.
755 977
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 978This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 979removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 980results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 981
760=back 982=back
761 983
762=cut 984=cut
763 985
764############################################################################# 986#############################################################################
765# object support 987# object support
988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
1022sub _can_merge {
1023 my ($ob1, $ob2) = @_;
1024
1025 ++$SLOW_MERGES;#d#
1026
1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
1029}
766 1030
767sub reattach { 1031sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1033 my ($obj) = @_;
770 1034
817sub object_freezer_save { 1081sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
819 1083
820 sync_job { 1084 sync_job {
821 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
824 1089
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1094 close $fh;
830 1095
831 if (@$objs) { 1096 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1102 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
839 } 1104 }
847 } 1112 }
848 } else { 1113 } else {
849 aio_unlink $filename; 1114 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
851 } 1116 }
852 } 1117 };
853} 1118}
854 1119
855sub object_freezer_as_string { 1120sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
857 1122
869 or return; 1134 or return;
870 1135
871 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
873 or return; 1138 or return;
1139
874 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
875 } 1142 }
876 1143
1144 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
879 return ($data, $av); 1148 ($data, $av)
880} 1149}
1150
1151=head2 COMMAND CALLBACKS
1152
1153=over 4
1154
1155=cut
881 1156
882############################################################################# 1157#############################################################################
883# command handling &c 1158# command handling &c
884 1159
885=item cf::register_command $name => \&callback($ob,$args); 1160=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1173 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1174}
900 1175
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1176=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1177
903Register a callbackf ro execution when the client sends an extcmd packet. 1178Register a callback for execution when the client sends an (synchronous)
1179extcmd packet. Ext commands will be processed in the order they are
1180received by the server, like other user commands. The first argument is
1181the logged-in player. Ext commands can only be processed after a player
1182has logged in successfully.
904 1183
905If the callback returns something, it is sent back as if reply was being 1184If the callback returns something, it is sent back as if reply was being
906called. 1185called.
907 1186
1187=item cf::register_exticmd $name => \&callback($ns,$packet);
1188
1189Register a callback for execution when the client sends an (asynchronous)
1190exticmd packet. Exti commands are processed by the server as soon as they
1191are received, i.e. out of order w.r.t. other commands. The first argument
1192is a client socket. Exti commands can be received anytime, even before
1193log-in.
1194
1195If the callback returns something, it is sent back as if reply was being
1196called.
1197
908=cut 1198=cut
909 1199
910sub register_extcmd { 1200sub register_extcmd {
911 my ($name, $cb) = @_; 1201 my ($name, $cb) = @_;
912 1202
913 $EXTCMD{$name} = $cb; 1203 $EXTCMD{$name} = $cb;
1204}
1205
1206sub register_exticmd {
1207 my ($name, $cb) = @_;
1208
1209 $EXTICMD{$name} = $cb;
914} 1210}
915 1211
916cf::player->attach ( 1212cf::player->attach (
917 on_command => sub { 1213 on_command => sub {
918 my ($pl, $name, $params) = @_; 1214 my ($pl, $name, $params) = @_;
927 cf::override; 1223 cf::override;
928 }, 1224 },
929 on_extcmd => sub { 1225 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
931 1227
932 my $msg = eval { from_json $buf }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1229
934 if (ref $msg) { 1230 if (ref $msg) {
1231 my ($type, $reply, @payload) =
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235
1236 my @reply;
1237
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
940 } else { 1245 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1247 }
943 1248
944 cf::override; 1249 cf::override;
1018 }; 1323 };
1019} 1324}
1020 1325
1021############################################################################# 1326#############################################################################
1022 1327
1328=back
1329
1023=head2 CORE EXTENSIONS 1330=head2 CORE EXTENSIONS
1024 1331
1025Functions and methods that extend core crossfire objects. 1332Functions and methods that extend core crossfire objects.
1026 1333
1027=cut 1334=cut
1031use Coro::AIO; 1338use Coro::AIO;
1032 1339
1033=head3 cf::player 1340=head3 cf::player
1034 1341
1035=over 4 1342=over 4
1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
1036 1357
1037=item cf::player::find $login 1358=item cf::player::find $login
1038 1359
1039Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1040 1361
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1080 1401
1081 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1082 or return; 1403 or return;
1404
1405 my $pl = cf::player::load_pl $f
1406 or return;
1407 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs;
1083 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1084 } 1410 }
1085 } 1411 }
1086} 1412}
1087 1413
1097 1423
1098 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1099 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1100 1426
1101 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1102 Coro::cede; 1428 cf::cede_to_tick;
1103} 1429}
1104 1430
1105sub new($) { 1431sub new($) {
1106 my ($login) = @_; 1432 my ($login) = @_;
1107 1433
1111 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1112 1438
1113 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1114 1440
1115 $self 1441 $self
1442}
1443
1444=item $player->send_msg ($channel, $msg, $color, [extra...])
1445
1446=cut
1447
1448sub send_msg {
1449 my $ns = shift->ns
1450 or return;
1451 $ns->send_msg (@_);
1116} 1452}
1117 1453
1118=item $pl->quit_character 1454=item $pl->quit_character
1119 1455
1120Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1175 or return []; 1511 or return [];
1176 1512
1177 my @logins; 1513 my @logins;
1178 1514
1179 for my $login (@$dirs) { 1515 for my $login (@$dirs) {
1516 my $path = path $login;
1517
1518 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") {
1180 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1181 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1182 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1183 1524
1184 utf8::decode $login; 1525 utf8::decode $login;
1185 push @logins, $login; 1526 push @logins, $login;
1186 } 1527 }
1187 1528
1214 } 1555 }
1215 1556
1216 \@paths 1557 \@paths
1217} 1558}
1218 1559
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1561
1562Expand crossfire pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652
1219=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1220 1654
1221Sends an ext reply to the player. 1655Sends an ext reply to the player.
1222 1656
1223=cut 1657=cut
1224 1658
1225sub ext_reply($$%) { 1659sub ext_reply($$@) {
1226 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1227 1661
1228 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1229
1230 $self->send ("ext " . cf::to_json \%msg);
1231} 1663}
1232 1664
1233=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1234 1666
1235Sends an ext event to the client. 1667Sends an ext event to the client.
1236 1668
1237=cut 1669=cut
1238 1670
1239sub ext_event($$%) { 1671sub ext_msg($$@) {
1240 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1241 1673
1242 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1243} 1675}
1244 1676
1245=head3 cf::region 1677=head3 cf::region
1246 1678
1247=over 4 1679=over 4
1250 1682
1251package cf::region; 1683package cf::region;
1252 1684
1253=item cf::region::find_by_path $path 1685=item cf::region::find_by_path $path
1254 1686
1255Tries to decuce the probable region for a map knowing only its path. 1687Tries to decuce the likely region for a map knowing only its path.
1256 1688
1257=cut 1689=cut
1258 1690
1259sub find_by_path($) { 1691sub find_by_path($) {
1260 my ($path) = @_; 1692 my ($path) = @_;
1261 1693
1262 my ($match, $specificity); 1694 my ($match, $specificity);
1263 1695
1264 for my $region (list) { 1696 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) { 1697 if ($region->{match} && $path =~ $region->{match}) {
1266 ($match, $specificity) = ($region, $region->specificity) 1698 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity; 1699 if $region->specificity > $specificity;
1268 } 1700 }
1269 } 1701 }
1270 1702
1390 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1391 return $self; 1823 return $self;
1392 } 1824 }
1393 } 1825 }
1394 1826
1395 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1396 () 1828 ()
1397} 1829}
1398 1830
1399sub init { 1831sub init {
1400 my ($self) = @_; 1832 my ($self) = @_;
1463 1895
1464sub load_header_from($) { 1896sub load_header_from($) {
1465 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1466 1898
1467 utf8::encode $path; 1899 utf8::encode $path;
1468 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1469 # or return;
1470
1471 $self->_load_header ($path)
1472 or return; 1901 or return;
1902
1903 $self->_load_header ($f)
1904 or return;
1905
1906 local $MAP_LOADING{$self->{path}} = $self;
1907 $f->resolve_delayed_derefs;
1473 1908
1474 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1475 1910
1476 1 1911 1
1477} 1912}
1531sub find { 1966sub find {
1532 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1533 1968
1534 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1535 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1536 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1537 1973
1538 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1539 my $guard = cf::lock_acquire "map_find:$path"; 1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1540 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1541 or return; 1979 or return;
1542 1980
1543 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1544 1982
1546 or return; 1984 or return;
1547 1985
1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1549 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1550 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1551 $map->reset; 1991 $map->reset;
1552 undef $guard;
1553 return find $path; 1992 return find $path;
1554 } 1993 }
1555 1994
1556 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1557 } 1996 }
1566 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1567 2006
1568 my $path = $self->{path}; 2007 my $path = $self->{path};
1569 2008
1570 { 2009 {
1571 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1572 2011
2012 return unless $self->valid;
1573 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1574 2014
1575 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1576 2016
1577 $self->alloc; 2017 $self->alloc;
1578 2018
1579 $self->pre_load; 2019 $self->pre_load;
1580 Coro::cede; 2020 cf::cede_to_tick;
1581 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1582 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1583 or return; 2025 or return;
1584 2026
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1587 2029
1588 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq; 2031 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1591 $self->clear_unique_items; 2034 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1593 } 2038 }
1594 } 2039 }
1595 2040
1596 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1597 # now do the right thing for maps 2044 # now do the right thing for maps
1598 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1599 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1600 unless $self->difficulty; 2047 unless $self->difficulty;
1601 Coro::cede; 2048 cf::cede_to_tick;
1602 2049
1603 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1604 $self->decay_objects; 2051 $self->decay_objects;
1605 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1606 $self->update_buttons; 2053 $self->update_buttons;
1607 Coro::cede; 2054 cf::cede_to_tick;
1608 $self->set_darkness_map; 2055 $self->set_darkness_map;
1609 Coro::cede; 2056 cf::cede_to_tick;
1610 $self->activate; 2057 $self->activate;
1611 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1612 2062
1613 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1614 } 2064 }
1615 2065
1616 $self->post_load; 2066 $self->post_load;
1627 2077
1628 $self 2078 $self
1629} 2079}
1630 2080
1631# find and load all maps in the 3x3 area around a map 2081# find and load all maps in the 3x3 area around a map
1632sub load_diag { 2082sub load_neighbours {
1633 my ($map) = @_; 2083 my ($map) = @_;
1634 2084
1635 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1636 2086
1637 for (0 .. 3) { 2087 for (0 .. 3) {
1638 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1639 or next; 2089 or next;
1640 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1641 or next; 2091 or next;
1642 $neigh->load; 2092 $neigh->load;
1643 2093
2094 push @neigh,
1644 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1645 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1646 } 2097 }
1647 2098
1648 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1649 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1650 or next; 2102 or next;
1651 $neigh->load; 2103 $neigh->load;
1652 } 2104 }
1653} 2105}
1654 2106
1659} 2111}
1660 2112
1661sub do_load_sync { 2113sub do_load_sync {
1662 my ($map) = @_; 2114 my ($map) = @_;
1663 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1664 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1665} 2120}
1666 2121
1667our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1668our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1669 2124
1670sub find_async { 2125sub find_async {
1671 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1672 2127
1673 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1674 2129
1675 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1677 } 2132 }
1678 2133
1679 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1680 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1681 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1683 my $map = find $path 2141 if (my $map = find $k) {
1684 or next;
1685 $map->load; 2142 $map->load if $v;
2143 }
1686 2144
1687 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1688 } 2146 }
1689 } 2147 }
1690 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1691 }; 2149 };
1692 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1695} 2153}
1696 2154
1697sub save { 2155sub save {
1698 my ($self) = @_; 2156 my ($self) = @_;
1699 2157
1700 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1701 2159
1702 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1703 2161
1704 return unless $self->dirty; 2162 return unless $self->dirty;
1705 2163
1711 return if $self->{deny_save}; 2169 return if $self->{deny_save};
1712 2170
1713 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
1714 2172
1715 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
1716 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
1717 }; 2176 };
1718 2177
1719 if ($uniq) { 2178 if ($uniq) {
1720 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1728 my ($self) = @_; 2187 my ($self) = @_;
1729 2188
1730 # save first because save cedes 2189 # save first because save cedes
1731 $self->save; 2190 $self->save;
1732 2191
1733 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
1734 2193
1735 return if $self->players; 2194 return if $self->players;
1736 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
1737 return if $self->{deny_save}; 2196 return if $self->{deny_save};
1738 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
1739 $self->clear; 2202 $self->clear;
1740 $self->in_memory (cf::MAP_SWAPPED);
1741} 2203}
1742 2204
1743sub reset_at { 2205sub reset_at {
1744 my ($self) = @_; 2206 my ($self) = @_;
1745 2207
1777 if $uniq; 2239 if $uniq;
1778 } 2240 }
1779 2241
1780 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
1781 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
1782 $self->clear; 2246 $self->clear;
1783
1784 $_->clear_links_to ($self) for values %cf::MAP;
1785 2247
1786 $self->unlink_save; 2248 $self->unlink_save;
1787 $self->destroy; 2249 $self->destroy;
1788} 2250}
1789 2251
1790my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
1791 2253
1792sub nuke { 2254sub nuke {
1793 my ($self) = @_; 2255 my ($self) = @_;
1794 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
1795 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
1796 2261
1797 $self->unlink_save; 2262 $self->unlink_save;
1798 2263
1799 bless $self, "cf::map"; 2264 bless $self, "cf::map";
1800 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
1801 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
1802 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
1803 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1804 2269
1805 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
1806 2272
1807 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
1808} 2274}
1809 2275
1810=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
1886 2352
1887sub inv_recursive { 2353sub inv_recursive {
1888 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
1889} 2355}
1890 2356
2357=item $ref = $ob->ref
2358
2359creates and returns a persistent reference to an objetc that can be stored as a string.
2360
2361=item $ob = cf::object::deref ($refstring)
2362
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block.
2365
2366=cut
2367
2368sub deref {
2369 my ($ref) = @_;
2370
2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2372 my ($uuid, $name) = ($1, $2);
2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2374 or return;
2375 $pl->ob->uuid eq $uuid
2376 or return;
2377
2378 $pl->ob
2379 } else {
2380 warn "$ref: cannot resolve object reference\n";
2381 undef
2382 }
2383}
2384
1891package cf; 2385package cf;
1892 2386
1893=back 2387=back
1894 2388
1895=head3 cf::object::player 2389=head3 cf::object::player
1912 2406
1913 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2407 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1914 2408
1915 if ($self->{record_replies}) { 2409 if ($self->{record_replies}) {
1916 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2410 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2411
1917 } else { 2412 } else {
2413 my $pl = $self->contr;
2414
2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2416 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418
2419 } else {
1918 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
1919 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2422 }
1920 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
1921} 2434}
1922 2435
1923=item $player_object->may ("access") 2436=item $player_object->may ("access")
1924 2437
1925Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2004 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2005 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2006 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2007 2520
2008 $map->load; 2521 $map->load;
2009 $map->load_diag; 2522 $map->load_neighbours;
2010 2523
2011 return unless $self->contr->active; 2524 return unless $self->contr->active;
2012 $self->activate_recursive; 2525 $self->activate_recursive;
2013 2526
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2016} 2529}
2017 2530
2018=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2019 2532
2020Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position. 2536the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process.
2024 2538
2025=cut 2539=cut
2026 2540
2027our $GOTOGEN; 2541our $GOTOGEN;
2028 2542
2029sub cf::object::player::goto { 2543sub cf::object::player::goto {
2030 my ($self, $path, $x, $y, $check) = @_; 2544 my ($self, $path, $x, $y, $check, $done) = @_;
2031 2545
2032 # do generation counting so two concurrent goto's will be executed in-order 2546 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034 2548
2035 $self->enter_link; 2549 $self->enter_link;
2036 2550
2037 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2038 my $map = eval { 2573 my $map = eval {
2039 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2040 2575
2041 if ($map) { 2576 if ($map) {
2042 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2044 } else { 2579 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2046 } 2581 }
2047 2582
2048 $map 2583 $map
2049 }; 2584 };
2050 2585
2055 2590
2056 if ($gen == $self->{_goto_generation}) { 2591 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation}; 2592 delete $self->{_goto_generation};
2058 $self->leave_link ($map, $x, $y); 2593 $self->leave_link ($map, $x, $y);
2059 } 2594 }
2595
2596 $done->() if $done;
2060 })->prio (1); 2597 })->prio (1);
2061} 2598}
2062 2599
2063=item $player_object->enter_exit ($exit_object) 2600=item $player_object->enter_exit ($exit_object)
2064 2601
2133 my $hp = $exit->stats->hp; 2670 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp; 2671 my $sp = $exit->stats->sp;
2135 2672
2136 $self->enter_link; 2673 $self->enter_link;
2137 2674
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2138 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2139 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2140 unless (eval { 2683 unless (eval {
2141 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2142 2685
2143 1; 2686 1;
2169 2712
2170 utf8::encode $text; 2713 utf8::encode $text;
2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2172} 2715}
2173 2716
2717=item $client->send_msg ($channel, $msg, $color, [extra...])
2718
2719Send a drawinfo or msg packet to the client, formatting the msg for the
2720client if neccessary. C<$type> should be a string identifying the type of
2721the message, with C<log> being the default. If C<$color> is negative, suppress
2722the message unless the client supports the msg packet.
2723
2724=cut
2725
2726# non-persistent channels (usually the info channel)
2727our %CHANNEL = (
2728 "c/identify" => {
2729 id => "infobox",
2730 title => "Identify",
2731 reply => undef,
2732 tooltip => "Items recently identified",
2733 },
2734 "c/examine" => {
2735 id => "infobox",
2736 title => "Examine",
2737 reply => undef,
2738 tooltip => "Signs and other items you examined",
2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2776);
2777
2778sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_;
2780
2781 $msg = $self->pl->expand_cfpod ($msg);
2782
2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784
2785 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2794 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800 }
2801
2802 $channel = $channel->{id};
2803 }
2804
2805 return unless @extra || length $msg;
2806
2807 if ($self->can_msg) {
2808 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF;
2811
2812 $self->send_packet ("msg " . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2814 } else {
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825
2826 $color &= cf::NDI_COLOR_MASK;
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839}
2840
2174=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2175 2842
2176Sends an exti event to the client. 2843Sends an ext event to the client.
2177 2844
2178=cut 2845=cut
2179 2846
2180sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2181 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2182 2849
2850 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2183 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg); 2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 }
2856}
2857
2858=item $client->ext_reply ($msgid, @msg)
2859
2860Sends an ext reply to the client.
2861
2862=cut
2863
2864sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_;
2866
2867 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2185} 2874}
2186 2875
2187=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2188 2877
2189Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2879the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2880C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192 2881
2193Queries can fail, so check the return code. Or don't, as queries will become 2882Queries can fail, so check the return code. Or don't, as queries will
2194reliable at some point in the future. 2883become reliable at some point in the future.
2195 2884
2196=cut 2885=cut
2197 2886
2198sub cf::client::query { 2887sub cf::client::query {
2199 my ($self, $flags, $text, $cb) = @_; 2888 my ($self, $flags, $text, $cb) = @_;
2207 utf8::encode $text; 2896 utf8::encode $text;
2208 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2897 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209 2898
2210 $self->send_packet ($self->{query_queue}[0][0]) 2899 $self->send_packet ($self->{query_queue}[0][0])
2211 if @{ $self->{query_queue} } == 1; 2900 if @{ $self->{query_queue} } == 1;
2901
2902 1
2212} 2903}
2213 2904
2214cf::client->attach ( 2905cf::client->attach (
2906 on_connect => sub {
2907 my ($ns) = @_;
2908
2909 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2910 },
2215 on_reply => sub { 2911 on_reply => sub {
2216 my ($ns, $msg) = @_; 2912 my ($ns, $msg) = @_;
2217 2913
2218 # this weird shuffling is so that direct followup queries 2914 # this weird shuffling is so that direct followup queries
2219 # get handled first 2915 # get handled first
2231 } else { 2927 } else {
2232 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2928 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233 } 2929 }
2234 } 2930 }
2235 }, 2931 },
2932 on_exticmd => sub {
2933 my ($ns, $buf) = @_;
2934
2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2936
2937 if (ref $msg) {
2938 my ($type, $reply, @payload) =
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942
2943 my @reply;
2944
2945 if (my $cb = $EXTICMD{$type}) {
2946 @reply = $cb->($ns, @payload);
2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2952 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 }
2955
2956 cf::override;
2957 },
2236); 2958);
2237 2959
2238=item $client->async (\&cb) 2960=item $client->async (\&cb)
2239 2961
2240Create a new coroutine, running the specified callback. The coroutine will 2962Create a new coroutine, running the specified callback. The coroutine will
2281our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2282our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2283 3005
2284$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2285 3007
2286$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3008$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math
3010 grepstart grepwhile mapstart mapwhile
3011 sort time
3012));
2287 3013
2288# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2289 3015
2290=pod 3016=pod
2291 3017
2292The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2293 3019
2294 cf::object contr pay_amount pay_player map 3020 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr
3023
2295 cf::object::player player 3024 cf::object::player
2296 cf::player peaceful 3025 player
2297 cf::map trigger 3026
3027 cf::player
3028 peaceful
3029
3030 cf::map
3031 trigger
2298 3032
2299=cut 3033=cut
2300 3034
2301for ( 3035for (
2302 ["cf::object" => qw(contr pay_amount pay_player map)], 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race
3038 decrease_ob_nr destroy)],
2303 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2304 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2305 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2306) { 3042) {
2307 no strict 'refs'; 3043 no strict 'refs';
2378=back 3114=back
2379 3115
2380=cut 3116=cut
2381 3117
2382############################################################################# 3118#############################################################################
2383
2384=head2 EXTENSION DATABASE SUPPORT
2385
2386Crossfire maintains a very simple database for extension use. It can
2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388convert to/from binary).
2389
2390The parameter C<$family> should best start with the name of the extension
2391using it, it should be unique.
2392
2393=over 4
2394
2395=item $value = cf::db_get $family => $key
2396
2397Returns a single value from the database.
2398
2399=item cf::db_put $family => $key => $value
2400
2401Stores the given C<$value> in the family.
2402
2403=cut
2404
2405our $DB;
2406
2407sub db_init {
2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2410
2411 cf::sync_job {
2412 eval {
2413 $DB->set_flags (BDB::CHKSUM);
2414
2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2417 cf::cleanup "db_open(db): $!" if $!;
2418 };
2419 cf::cleanup "db_open(db): $@" if $@;
2420 };
2421 }
2422}
2423
2424sub db_get($$) {
2425 my $key = "$_[0]/$_[1]";
2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2435sub db_put($$$) {
2436 BDB::dbreq_pri 4;
2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2552}
2553
2554#############################################################################
2555# the server's init and main functions 3119# the server's init and main functions
2556 3120
2557sub load_facedata($) { 3121sub load_facedata($) {
2558 my ($path) = @_; 3122 my ($path) = @_;
3123
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2559 3129
2560 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2561 3131
2562 my $facedata; 3132 my $facedata;
2563 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2566 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2567 3137
2568 $facedata->{version} == 2 3138 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed."; 3139 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570 3140
3141 # patch in the exptable
3142 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3145 };
3146 cf::cede_to_tick;
3147
2571 { 3148 {
2572 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2573 3150
2574 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3153 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2579 Coro::cede; 3157
3158 cf::cede_to_tick;
2580 } 3159 }
2581 3160
2582 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth}; 3162 next unless $info->{smooth};
2584 my $idx = cf::face::find $face 3163 my $idx = cf::face::find $face
2585 or next; 3164 or next;
2586 if (my $smooth = cf::face::find $info->{smooth}) { 3165 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth;
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588 } else { 3168 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3169 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 } 3170 }
2591 Coro::cede; 3171
3172 cf::cede_to_tick;
2592 } 3173 }
2593 } 3174 }
2594 3175
2595 { 3176 {
2596 my $anims = $facedata->{animinfo}; 3177 my $anims = $facedata->{animinfo};
2597 3178
2598 while (my ($anim, $info) = each %$anims) { 3179 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3180 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede; 3181 cf::cede_to_tick;
2601 } 3182 }
2602 3183
2603 cf::anim::invalidate_all; # d'oh 3184 cf::anim::invalidate_all; # d'oh
2604 } 3185 }
2605 3186
3187 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource};
3191
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197
3198 if ($info->{type} & 1) {
3199 # prepend meta info
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else {
3208 $data = $info->{data};
3209 }
3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick;
3215 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 }
3235
2606 1 3236 1
2607} 3237}
2608 3238
3239register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_;
3241
3242 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v);
3244 }
3245};
3246
2609sub reload_regions { 3247sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
2610 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
3254
3255 for (cf::region::list) {
3256 $_->{match} = qr/$_->{match}/
3257 if exists $_->{match};
3258 }
2612} 3259}
2613 3260
2614sub reload_facedata { 3261sub reload_facedata {
2615 load_facedata "$DATADIR/facedata" 3262 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n"; 3263 or die "unable to load facedata\n";
2617} 3264}
2618 3265
2619sub reload_archetypes { 3266sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
2620 load_resource_file "$DATADIR/archetypes" 3272 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n"; 3273 or die "unable to load archetypes\n";
2622} 3274}
2623 3275
2624sub reload_treasures { 3276sub reload_treasures {
2640 3292
2641sub init { 3293sub init {
2642 reload_resources; 3294 reload_resources;
2643} 3295}
2644 3296
2645sub cfg_load { 3297sub reload_config {
2646 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2647 or return; 3299 or return;
2648 3300
2649 local $/; 3301 local $/;
2650 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2666sub main { 3318sub main {
2667 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2668 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2669 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2670 (async { 3322 (async {
2671 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2672 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2673 }; 3326 };
2674 3327
2675 cfg_load; 3328 reload_config;
2676 db_init; 3329 db_init;
2677 load_extensions; 3330 load_extensions;
2678 3331
2679 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2680 Event::loop; 3334 EV::loop;
2681} 3335}
2682 3336
2683############################################################################# 3337#############################################################################
2684# initialisation and cleanup 3338# initialisation and cleanup
2685 3339
2686# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
2687BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
2688 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
2689 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2690 reentrant => 0,
2691 data => WF_AUTOCANCEL,
2692 signal => $signal,
2693 prio => 0,
2694 cb => sub {
2695 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
2696 },
2697 ); 3346 };
3347 }
3348}
3349
3350sub write_runtime {
3351 my $runtime = "$LOCALDIR/runtime";
3352
3353 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time.
3355
3356 IO::AIO::aio_utime $runtime, undef, undef;
3357
3358 my $guard = cf::lock_acquire "write_runtime";
3359
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3361 or return;
3362
3363 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server.
3366
3367 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3368 and return;
3369
3370 # always fsync - this file is important
3371 aio_fsync $fh
3372 and return;
3373
3374 # touch it again to show we are up-to-date
3375 aio_utime $fh, undef, undef;
3376
3377 close $fh
3378 or return;
3379
3380 aio_rename "$runtime~", $runtime
3381 and return;
3382
3383 warn "runtime file written.\n";
3384
2698 } 3385 1
2699} 3386}
2700 3387
2701sub emergency_save() { 3388sub emergency_save() {
2702 my $freeze_guard = cf::freeze_mainloop; 3389 my $freeze_guard = cf::freeze_mainloop;
2703 3390
2709 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
2710 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
2711 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
2712 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
2713 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2714 $pl->save; 3402 $pl->save;
2715 } 3403 }
2716 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
2717 3405
2718 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
2757 warn "syncing database to disk"; 3445 warn "syncing database to disk";
2758 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
2759 3447
2760 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
2761 3449
2762 warn "cancelling all WF_AUTOCANCEL watchers";
2763 for (Event::all_watchers) {
2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2765 }
2766
2767 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
2768 for (;;) { 3451 for (;;) {
2769 BDB::flush; 3452 BDB::flush;
2770 IO::AIO::flush; 3453 IO::AIO::flush;
2771 Coro::cede; 3454 Coro::cede_notself;
2772 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
2773 warn "iterate..."; 3456 warn "iterate...";
2774 } 3457 }
2775 3458
2776 ++$RELOAD; 3459 ++$RELOAD;
2780 %EXT_CORO = (); 3463 %EXT_CORO = ();
2781 3464
2782 warn "removing commands"; 3465 warn "removing commands";
2783 %COMMAND = (); 3466 %COMMAND = ();
2784 3467
2785 warn "removing ext commands"; 3468 warn "removing ext/exti commands";
2786 %EXTCMD = (); 3469 %EXTCMD = ();
3470 %EXTICMD = ();
2787 3471
2788 warn "unloading/nuking all extensions"; 3472 warn "unloading/nuking all extensions";
2789 for my $pkg (@EXTS) { 3473 for my $pkg (@EXTS) {
2790 warn "... unloading $pkg"; 3474 warn "... unloading $pkg";
2791 3475
2834 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
2835 require cf; 3519 require cf;
2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2837 3521
2838 warn "loading config and database again"; 3522 warn "loading config and database again";
2839 cf::cfg_load; 3523 cf::reload_config;
2840 3524
2841 warn "loading extensions"; 3525 warn "loading extensions";
2842 cf::load_extensions; 3526 cf::load_extensions;
2843 3527
2844 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
2864 3548
2865sub reload_perl() { 3549sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
2868 3552
2869 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2870 reentrant => 0,
2871 after => 0,
2872 data => WF_AUTOCANCEL,
2873 cb => sub {
2874 do_reload_perl;
2875 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
2876 }, 3555 do_reload_perl;
2877 ); 3556 };
2878} 3557}
2879 3558
2880register_command "reload" => sub { 3559register_command "reload" => sub {
2881 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
2882 3561
2883 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
2884 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
2885 async { reload_perl }; 3566 reload_perl;
3567 };
2886 } 3568 }
2887}; 3569};
2888 3570
2889unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
2890 3572
2909 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait; 3593 $signal->wait;
2912} 3594}
2913 3595
2914 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2915 my $avg = 10;
2916$TICK_WATCHER = Event->timer (
2917 reentrant => 0,
2918 parked => 1,
2919 prio => 0,
2920 at => $NEXT_TICK || $TICK,
2921 data => WF_AUTOCANCEL,
2922 cb => sub {
2923 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2925 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
2926 return; 3600 return;
2927 } 3601 }
2928 3602
2929 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
2930 3604
2931 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
2932 3606
2933 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
2934 for(1..10) { 3608 $NEXT_TICK += $TICK;
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938 3609
2939 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2940 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
2941 $map->alloc; 3612 Coro::async_pool {
2942 $map->_load_objects ("/tmp/x.map", 1); 3613 $Coro::current->{desc} = "runtime saver";
2943 my $t = Event::time - $t; 3614 write_runtime
2944 3615 or warn "ERROR: unable to write runtime file: $!";
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 }; 3616 };
3617 }
2955 3618
2956 $RUNTIME += $TICK;
2957 $NEXT_TICK += $TICK;
2958
2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send; 3620 $sig->send;
2972 } 3621 }
2973 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send; 3623 $sig->send;
2975 } 3624 }
2976 3625
2977 $NOW = Event::time;
2978
2979 # if we are delayed by four ticks or more, skip them all
2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2981
2982 $TICK_WATCHER->at ($NEXT_TICK);
2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987 3628
2988 _post_tick; 3629 _post_tick;
2989 3630};
2990 3631$TICK_WATCHER->priority (EV::MAXPRI);
2991 },
2992);
2993 3632
2994{ 3633{
3634 BDB::min_parallel 8;
2995 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
2996 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8;
3005 3637
3006 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3007 my $status; 3639 my $status;
3008 my $current = $Coro::current; 3640 my $current = $Coro::current;
3009 ( 3641 (
3018 ) 3650 )
3019 }; 3651 };
3020 3652
3021 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3022 $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);
3023 3659
3024 cf::sync_job { 3660 cf::sync_job {
3025 eval { 3661 eval {
3026 BDB::db_env_open 3662 BDB::db_env_open
3027 $DB_ENV, 3663 $DB_ENV,
3029 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
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666; 3667 0666;
3032 3668
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 }; 3670 };
3038 3671
3039 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3040 }; 3673 };
3041 } 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 };
3042} 3685}
3043 3686
3044{ 3687{
3045 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3046 3689
3047 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3048 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3049 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3050 reentrant => 0,
3051 data => WF_AUTOCANCEL,
3052 fd => IO::AIO::poll_fileno,
3053 poll => 'r',
3054 prio => 6,
3055 cb => \&IO::AIO::poll_cb,
3056 );
3057} 3693}
3058 3694
3059my $_log_backtrace; 3695my $_log_backtrace;
3060 3696
3061sub _log_backtrace { 3697sub _log_backtrace {
3065 3701
3066 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace; 3704 ++$_log_backtrace;
3069 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3070 my @bt = fork_call { 3708 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 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 |"
3074 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines