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.256 by root, Sat Apr 21 16:56:32 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
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.32 ();
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
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
154 178
155=back 179=back
156 180
157=cut 181=cut
158 182
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 204
180# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
191} 216}
192 217
193$Event::DIED = sub { 218$Event::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $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;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
231 256
232Converts 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]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
239 271
240Wait 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
241a 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,
242for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
243returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
244 279
245Lock 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
246uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
247 282
248=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
291 }; 326 };
292 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
293 $guard 328 $guard
294} 329}
295 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
296=item cf::async { BLOCK } 387=item cf::async { BLOCK }
297 388
298Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
303 394
304BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
305 396
306=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
307 398
308The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
311 403
312If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
315fast or be very important. 407fast or be very important.
318 410
319sub sync_job(&) { 411sub sync_job(&) {
320 my ($job) = @_; 412 my ($job) = @_;
321 413
322 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
323 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
325 419
326 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 421 # (but this is cancel-safe)
338 432
339 while ($busy) { 433 while ($busy) {
340 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
341 } 435 }
342 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
343 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
344 } else { 445 } else {
345 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
346 447
347 $job->() 448 $job->()
366 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
367 468
368 $coro 469 $coro
369} 470}
370 471
371sub write_runtime { 472=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 473
374 my $runtime = "$LOCALDIR/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
375 478
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
377 or return;
378 480
379 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 483
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
384 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
385 487
386 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 489 reset_signals;
388 and return; 490 &$cb
491 }, @args;
389 492
390 close $fh 493 wantarray ? @res : $res[-1]
391 or return; 494}
392 495
393 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
394 and return;
395 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
396 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
397} 610}
398 611
399=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
400 613
401Log a datalog packet of the given type with the given key-value pairs. 614Log a datalog packet of the given type with the given key-value pairs.
419attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
421 634
422In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 637Crossfire TRT).
425 638
426=over 4 639=over 4
427 640
428=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
429 642
592 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
593 806
594 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 811
599 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 813 my $pkg = shift @arg;
601 814
602 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
632 } 845 }
633 846
634 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
635 } else { 848 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 850 }
638 851
639 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
640} 853}
641 854
643 if (ref $_[0]) { 856 if (ref $_[0]) {
644 _object_attach @_; 857 _object_attach @_;
645 } else { 858 } else {
646 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
647 } 860 }
861 _recalc_want;
648}; 862};
649 863
650# all those should be optimised 864# all those should be optimised
651sub cf::attachable::detach { 865sub cf::attachable::detach {
652 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
656 reattach ($obj); 870 reattach ($obj);
657 } else { 871 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
659 } 873 }
874 _recalc_want;
660}; 875};
661 876
662sub cf::attachable::attached { 877sub cf::attachable::attached {
663 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
664 879
679 "; 894 ";
680 die if $@; 895 die if $@;
681} 896}
682 897
683our $override; 898our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 900
686sub override { 901sub override {
687 $override = 1; 902 $override = 1;
688 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
689} 904}
690 905
691sub do_invoke { 906sub do_invoke {
692 my $event = shift; 907 my $event = shift;
693 my $callbacks = shift; 908 my $callbacks = shift;
694 909
695 @invoke_results = (); 910 @INVOKE_RESULTS = ();
696 911
697 local $override; 912 local $override;
698 913
699 for (@$callbacks) { 914 for (@$callbacks) {
700 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
717 932
718Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
719 934
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
721removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 938
724=back 939=back
725 940
726=cut 941=cut
727 942
728############################################################################# 943#############################################################################
729# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
730 956
731sub reattach { 957sub reattach {
732 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 959 my ($obj) = @_;
734 960
837 or return; 1063 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1065 }
840 1066
841 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1069 return ($data, $av);
844} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
845 1077
846############################################################################# 1078#############################################################################
847# command handling &c 1079# command handling &c
848 1080
849=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1095}
864 1096
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1098
867Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
868 1104
869If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
870called. 1106called.
871 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
872=cut 1119=cut
873 1120
874sub register_extcmd { 1121sub register_extcmd {
875 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
876 1123
877 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
878} 1131}
879 1132
880cf::player->attach ( 1133cf::player->attach (
881 on_command => sub { 1134 on_command => sub {
882 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
891 cf::override; 1144 cf::override;
892 }, 1145 },
893 on_extcmd => sub { 1146 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
895 1148
896 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1150
898 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
904 } else { 1166 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1168 }
907 1169
908 cf::override; 1170 cf::override;
909 }, 1171 },
910); 1172);
911 1173
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
947 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1179 next unless -r $path;
949 eval { 1180
950 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
951 1 1238 }
952 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
953 } 1244 };
954} 1245}
955 1246
956############################################################################# 1247#############################################################################
1248
1249=back
957 1250
958=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
959 1252
960Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
961 1254
1032 1325
1033 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1034 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1035 1328
1036 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1037 Coro::cede; 1330 cf::cede_to_tick;
1038} 1331}
1039 1332
1040sub new($) { 1333sub new($) {
1041 my ($login) = @_; 1334 my ($login) = @_;
1042 1335
1046 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1047 1340
1048 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1049 1342
1050 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1051} 1354}
1052 1355
1053=item $pl->quit_character 1356=item $pl->quit_character
1054 1357
1055Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1149 } 1452 }
1150 1453
1151 \@paths 1454 \@paths
1152} 1455}
1153 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506
1154=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1155 1508
1156Sends an ext reply to the player. 1509Sends an ext reply to the player.
1157 1510
1158=cut 1511=cut
1159 1512
1160sub ext_reply($$%) { 1513sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1162 1515
1163 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1517}
1167 1518
1168=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1169 1520
1170Sends an ext event to the client. 1521Sends an ext event to the client.
1171 1522
1172=cut 1523=cut
1173 1524
1174sub ext_event($$%) { 1525sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1176 1527
1177 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1178} 1529}
1179 1530
1180=head3 cf::region 1531=head3 cf::region
1181 1532
1182=over 4 1533=over 4
1185 1536
1186package cf::region; 1537package cf::region;
1187 1538
1188=item cf::region::find_by_path $path 1539=item cf::region::find_by_path $path
1189 1540
1190Tries to decuce the probable region for a map knowing only its path. 1541Tries to decuce the likely region for a map knowing only its path.
1191 1542
1192=cut 1543=cut
1193 1544
1194sub find_by_path($) { 1545sub find_by_path($) {
1195 my ($path) = @_; 1546 my ($path) = @_;
1196 1547
1197 my ($match, $specificity); 1548 my ($match, $specificity);
1198 1549
1199 for my $region (list) { 1550 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1203 } 1554 }
1204 } 1555 }
1205 1556
1269 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1270 1621
1271 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1272 local $self->{path}; 1623 local $self->{path};
1273 local $self->{load_path}; 1624 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1625
1277 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1278} 1627}
1279 1628
1280sub normalise { 1629sub normalise {
1327 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1328 return $self; 1677 return $self;
1329 } 1678 }
1330 } 1679 }
1331 1680
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1682 ()
1334} 1683}
1335 1684
1336sub init { 1685sub init {
1337 my ($self) = @_; 1686 my ($self) = @_;
1378sub change_all_map_light { 1727sub change_all_map_light {
1379 my ($change) = @_; 1728 my ($change) = @_;
1380 1729
1381 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1732}
1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1383} 1740}
1384 1741
1385sub unlink_save { 1742sub unlink_save {
1386 my ($self) = @_; 1743 my ($self) = @_;
1387 1744
1445 $self->load_header_orig 1802 $self->load_header_orig
1446 or return; 1803 or return;
1447 $self->prepare_orig; 1804 $self->prepare_orig;
1448 } 1805 }
1449 1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1810 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1811 unless $self->default_region;
1452 1812
1453 1 1813 1
1454} 1814}
1469 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1470 1830
1471 $map->load_header 1831 $map->load_header
1472 or return; 1832 or return;
1473 1833
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1837 $map->reset;
1478 undef $guard; 1838 undef $guard;
1479 return find $path; 1839 return find $path;
1492 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1493 1853
1494 my $path = $self->{path}; 1854 my $path = $self->{path};
1495 1855
1496 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1497 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1498 1859
1499 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1500 1861
1501 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1502 1863
1503 $self->alloc; 1864 $self->alloc;
1504 1865
1505 $self->pre_load; 1866 $self->pre_load;
1506 Coro::cede; 1867 cf::cede_to_tick;
1507 1868
1508 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1509 or return; 1870 or return;
1510 1871
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1517 $self->clear_unique_items; 1878 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1519 } 1880 }
1520 } 1881 }
1521 1882
1522 Coro::cede; 1883 cf::cede_to_tick;
1523 # now do the right thing for maps 1884 # now do the right thing for maps
1524 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1525 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1526 unless $self->difficulty; 1887 unless $self->difficulty;
1527 Coro::cede; 1888 cf::cede_to_tick;
1528 1889
1529 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1530 $self->decay_objects; 1891 $self->decay_objects;
1531 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1532 $self->update_buttons; 1893 $self->update_buttons;
1533 Coro::cede; 1894 cf::cede_to_tick;
1534 $self->set_darkness_map; 1895 $self->set_darkness_map;
1535 Coro::cede; 1896 cf::cede_to_tick;
1536 $self->activate; 1897 $self->activate;
1537 } 1898 }
1538 1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1902
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 } 1904 }
1543 1905
1544 $self->post_load; 1906 $self->post_load;
1545} 1907}
1546 1908
1548 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1549 1911
1550 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1551 if $self->per_player; 1913 if $self->per_player;
1552 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1553 $self 1918 $self
1554} 1919}
1555 1920
1556# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1557sub load_diag { 1922sub load_neighbours {
1558 my ($map) = @_; 1923 my ($map) = @_;
1559 1924
1560 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1561 1926
1562 for (0 .. 3) { 1927 for (0 .. 3) {
1563 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1564 or next; 1929 or next;
1565 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1566 or next; 1931 or next;
1567 $neigh->load; 1932 $neigh->load;
1568 1933
1934 push @neigh,
1569 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1570 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1571 } 1937 }
1572 1938
1573 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1574 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1575 or next; 1942 or next;
1576 $neigh->load; 1943 $neigh->load;
1577 } 1944 }
1578} 1945}
1579 1946
1584} 1951}
1585 1952
1586sub do_load_sync { 1953sub do_load_sync {
1587 my ($map) = @_; 1954 my ($map) = @_;
1588 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1589 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1590} 1960}
1591 1961
1592our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1593our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1594 1964
1595sub find_async { 1965sub find_async {
1596 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1597 1967
1598 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1599 1969
1600 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1601 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1602 } 1972 }
1603 1973
1604 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1605 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1606 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1607 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1608 my $map = find $path 1979 if (my $map = find $k) {
1609 or next;
1610 $map->load; 1980 $map->load if $v;
1981 }
1611 1982
1612 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1613 } 1984 }
1614 } 1985 }
1615 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1616 }; 1987 };
1617 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
1620} 1991}
1621 1992
1622sub save { 1993sub save {
1623 my ($self) = @_; 1994 my ($self) = @_;
1624 1995
1625 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1626 1997
1627 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1628 1999
1629 return unless $self->dirty; 2000 return unless $self->dirty;
1630 2001
1653 my ($self) = @_; 2024 my ($self) = @_;
1654 2025
1655 # save first because save cedes 2026 # save first because save cedes
1656 $self->save; 2027 $self->save;
1657 2028
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2030
1660 return if $self->players; 2031 return if $self->players;
1661 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1662 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1663 2034
1667 2038
1668sub reset_at { 2039sub reset_at {
1669 my ($self) = @_; 2040 my ($self) = @_;
1670 2041
1671 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1672 return 1e99 if $self->isa ("ext::map_per_player");#d#
1673 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1674 2044
1675 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1676 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2046 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1677 2047
1688 my ($self) = @_; 2058 my ($self) = @_;
1689 2059
1690 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1691 2061
1692 return if $self->players; 2062 return if $self->players;
1693 return if $self->isa ("ext::map_per_player");#d#
1694 2063
1695 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
1696 2065
1697 $self->in_memory (cf::MAP_SWAPPED); 2066 $self->in_memory (cf::MAP_SWAPPED);
1698 2067
1699 # need to save uniques path 2068 # need to save uniques path
1700 unless ($self->{deny_save}) { 2069 unless ($self->{deny_save}) {
1732 $cf::MAP{$self->path} = $self; 2101 $cf::MAP{$self->path} = $self;
1733 2102
1734 $self->reset; # polite request, might not happen 2103 $self->reset; # polite request, might not happen
1735} 2104}
1736 2105
2106=item $maps = cf::map::tmp_maps
2107
2108Returns an arrayref with all map paths of currently instantiated and saved
2109maps. May block.
2110
2111=cut
2112
2113sub tmp_maps() {
2114 [
2115 map {
2116 utf8::decode $_;
2117 /\.map$/
2118 ? normalise $_
2119 : ()
2120 } @{ aio_readdir $TMPDIR or [] }
2121 ]
2122}
2123
2124=item $maps = cf::map::random_maps
2125
2126Returns an arrayref with all map paths of currently instantiated and saved
2127random maps. May block.
2128
2129=cut
2130
2131sub random_maps() {
2132 [
2133 map {
2134 utf8::decode $_;
2135 /\.map$/
2136 ? normalise "?random/$_"
2137 : ()
2138 } @{ aio_readdir $RANDOMDIR or [] }
2139 ]
2140}
2141
1737=item cf::map::unique_maps 2142=item cf::map::unique_maps
1738 2143
1739Returns an arrayref of paths of all shared maps that have 2144Returns an arrayref of paths of all shared maps that have
1740instantiated unique items. May block. 2145instantiated unique items. May block.
1741 2146
1742=cut 2147=cut
1743 2148
1744sub unique_maps() { 2149sub unique_maps() {
1745 my $files = aio_readdir $UNIQUEDIR 2150 [
1746 or return; 2151 map {
1747
1748 my @paths;
1749
1750 for (@$files) {
1751 utf8::decode $_; 2152 utf8::decode $_;
1752 next if /\.pst$/; 2153 /\.map$/
1753 next unless /^$PATH_SEP/o; 2154 ? normalise $_
1754 2155 : ()
1755 push @paths, cf::map::normalise $_; 2156 } @{ aio_readdir $UNIQUEDIR or [] }
1756 } 2157 ]
1757
1758 \@paths
1759} 2158}
1760 2159
1761package cf; 2160package cf;
1762 2161
1763=back 2162=back
1809 2208
1810 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1811 2210
1812 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1813 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1814 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220
2221 } else {
1815 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
1816 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2224 }
1817 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
1818} 2236}
1819 2237
1820=item $player_object->may ("access") 2238=item $player_object->may ("access")
1821 2239
1822Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
1869 $self->deactivate_recursive; 2287 $self->deactivate_recursive;
1870 2288
1871 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2289 return if UNIVERSAL::isa $self->map, "ext::map_link";
1872 2290
1873 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2291 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1874 if $self->map; 2292 if $self->map && $self->map->{path} ne "{link}";
1875 2293
1876 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2294 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1877} 2295}
1878 2296
1879sub cf::object::player::leave_link { 2297sub cf::object::player::leave_link {
1880 my ($self, $map, $x, $y) = @_; 2298 my ($self, $map, $x, $y) = @_;
2299
2300 return unless $self->contr->active;
1881 2301
1882 my $link_pos = delete $self->{_link_pos}; 2302 my $link_pos = delete $self->{_link_pos};
1883 2303
1884 unless ($map) { 2304 unless ($map) {
1885 # restore original map position 2305 # restore original map position
1899 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
1900 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
1901 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
1902 2322
1903 $map->load; 2323 $map->load;
1904 $map->load_diag; 2324 $map->load_neighbours;
1905 2325
1906 return unless $self->contr->active; 2326 return unless $self->contr->active;
1907 $self->activate_recursive; 2327 $self->activate_recursive;
1908 2328
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1910 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
1911} 2331}
1912 2332
1913cf::player->attach ( 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1914 on_logout => sub {
1915 my ($pl) = @_;
1916 2334
1917 # abort map switching before logout 2335Moves the player to the given map-path and coordinates by first freezing
1918 if ($pl->ob->{_link_pos}) { 2336her, loading and preparing them map, calling the provided $check callback
1919 cf::sync_job { 2337that has to return the map if sucecssful, and then unfreezes the player on
1920 $pl->ob->leave_link 2338the new (success) or old (failed) map position. In either case, $done will
1921 }; 2339be called at the end of this process.
1922 }
1923 },
1924 on_login => sub {
1925 my ($pl) = @_;
1926 2340
1927 # try to abort aborted map switching on player login :)
1928 # should happen only on crashes
1929 if ($pl->ob->{_link_pos}) {
1930 $pl->ob->enter_link;
1931 (async {
1932 $pl->ob->reply (undef,
1933 "There was an internal problem at your last logout, "
1934 . "the server will try to bring you to your intended destination in a second.",
1935 cf::NDI_RED);
1936 # we need this sleep as the login has a concurrent enter_exit running
1937 # and this sleep increases chances of the player not ending up in scorn
1938 Coro::Timer::sleep 1;
1939 $pl->ob->leave_link;
1940 })->prio (2);
1941 }
1942 },
1943);
1944
1945=item $player_object->goto ($path, $x, $y)
1946
1947=cut 2341=cut
2342
2343our $GOTOGEN;
1948 2344
1949sub cf::object::player::goto { 2345sub cf::object::player::goto {
1950 my ($self, $path, $x, $y) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2347
2348 # do generation counting so two concurrent goto's will be executed in-order
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1951 2350
1952 $self->enter_link; 2351 $self->enter_link;
1953 2352
1954 (async { 2353 (async {
1955 my $map = eval { 2354 my $map = eval {
1956 my $map = cf::map::find $path; 2355 my $map = cf::map::find $path;
2356
2357 if ($map) {
1957 $map = $map->customise_for ($self) if $map; 2358 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map;
2360 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2362 }
2363
1958 $map 2364 $map
2365 };
2366
2367 if ($@) {
2368 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2369 LOG llevError | logBacktrace, Carp::longmess $@;
1959 } or 2370 }
1960 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1961 2371
2372 if ($gen == $self->{_goto_generation}) {
2373 delete $self->{_goto_generation};
1962 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2375 }
2376
2377 $done->() if $done;
1963 })->prio (1); 2378 })->prio (1);
1964} 2379}
1965 2380
1966=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
1967 2382
2036 my $hp = $exit->stats->hp; 2451 my $hp = $exit->stats->hp;
2037 my $sp = $exit->stats->sp; 2452 my $sp = $exit->stats->sp;
2038 2453
2039 $self->enter_link; 2454 $self->enter_link;
2040 2455
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
2459
2041 (async { 2460 (async {
2042 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
2043 unless (eval { 2462 unless (eval {
2044 $self->goto ($slaying, $hp, $sp); 2463 $self->goto ($slaying, $hp, $sp);
2045 2464
2072 2491
2073 utf8::encode $text; 2492 utf8::encode $text;
2074 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2075} 2494}
2076 2495
2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2497
2498Send a drawinfo or msg packet to the client, formatting the msg for the
2499client if neccessary. C<$type> should be a string identifying the type of
2500the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet.
2502
2503=cut
2504
2505sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_;
2507
2508 $msg = $self->pl->expand_cfpod ($msg);
2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2522 return unless @extra || length $msg;
2523
2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2531 } else {
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556}
2557
2077=item $client->ext_event ($type, %msg) 2558=item $client->ext_msg ($type, @msg)
2078 2559
2079Sends an exti event to the client. 2560Sends an ext event to the client.
2080 2561
2081=cut 2562=cut
2082 2563
2083sub cf::client::ext_event($$%) { 2564sub cf::client::ext_msg($$@) {
2084 my ($self, $type, %msg) = @_; 2565 my ($self, $type, @msg) = @_;
2085 2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2086 $msg{msgtype} = "event_$type"; 2570 push @msg, msgtype => "event_$type";
2087 $self->send_packet ("ext " . cf::to_json \%msg); 2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2088} 2591}
2089 2592
2090=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2091 2594
2092Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
2093the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2596the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2094C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2597C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2095 2598
2096Queries can fail, so check the return code. Or don't, as queries will become 2599Queries can fail, so check the return code. Or don't, as queries will
2097reliable at some point in the future. 2600become reliable at some point in the future.
2098 2601
2099=cut 2602=cut
2100 2603
2101sub cf::client::query { 2604sub cf::client::query {
2102 my ($self, $flags, $text, $cb) = @_; 2605 my ($self, $flags, $text, $cb) = @_;
2110 utf8::encode $text; 2613 utf8::encode $text;
2111 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2614 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2112 2615
2113 $self->send_packet ($self->{query_queue}[0][0]) 2616 $self->send_packet ($self->{query_queue}[0][0])
2114 if @{ $self->{query_queue} } == 1; 2617 if @{ $self->{query_queue} } == 1;
2618
2619 1
2115} 2620}
2116 2621
2117cf::client->attach ( 2622cf::client->attach (
2623 on_connect => sub {
2624 my ($ns) = @_;
2625
2626 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2627 },
2118 on_reply => sub { 2628 on_reply => sub {
2119 my ($ns, $msg) = @_; 2629 my ($ns, $msg) = @_;
2120 2630
2121 # this weird shuffling is so that direct followup queries 2631 # this weird shuffling is so that direct followup queries
2122 # get handled first 2632 # get handled first
2134 } else { 2644 } else {
2135 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2645 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2136 } 2646 }
2137 } 2647 }
2138 }, 2648 },
2649 on_exticmd => sub {
2650 my ($ns, $buf) = @_;
2651
2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2653
2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2662 if (my $cb = $EXTICMD{$type}) {
2663 @reply = $cb->($ns, @payload);
2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2669 } else {
2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2671 }
2672
2673 cf::override;
2674 },
2139); 2675);
2140 2676
2141=item $client->async (\&cb) 2677=item $client->async (\&cb)
2142 2678
2143Create a new coroutine, running the specified callback. The coroutine will 2679Create a new coroutine, running the specified callback. The coroutine will
2184our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2185our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2186 2722
2187$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2188 2724
2189$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2190 2730
2191# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2192 2732
2193=pod 2733=pod
2194 2734
2195The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2196 2736
2197 cf::object contr pay_amount pay_player map 2737 cf::object
2738 contr pay_amount pay_player map x y force_find force_add
2739 insert remove name archname title slaying race decrease_ob_nr
2740
2198 cf::object::player player 2741 cf::object::player
2199 cf::player peaceful 2742 player
2200 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2201 2749
2202=cut 2750=cut
2203 2751
2204for ( 2752for (
2205 ["cf::object" => qw(contr pay_amount pay_player map)], 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2206 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2207 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2208 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2209) { 2759) {
2210 no strict 'refs'; 2760 no strict 'refs';
2281=back 2831=back
2282 2832
2283=cut 2833=cut
2284 2834
2285############################################################################# 2835#############################################################################
2286
2287=head2 EXTENSION DATABASE SUPPORT
2288
2289Crossfire maintains a very simple database for extension use. It can
2290currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2291convert to/from binary).
2292
2293The parameter C<$family> should best start with the name of the extension
2294using it, it should be unique.
2295
2296=over 4
2297
2298=item $value = cf::db_get $family => $key
2299
2300Returns a single value from the database.
2301
2302=item cf::db_put $family => $key => $value
2303
2304Stores the given C<$value> in the family.
2305
2306=cut
2307
2308our $DB;
2309
2310sub db_init {
2311 unless ($DB) {
2312 $DB = BDB::db_create $DB_ENV;
2313
2314 cf::sync_job {
2315 eval {
2316 $DB->set_flags (BDB::CHKSUM);
2317
2318 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2319 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2320 cf::cleanup "db_open(db): $!" if $!;
2321 };
2322 cf::cleanup "db_open(db): $@" if $@;
2323 };
2324 }
2325}
2326
2327sub db_get($$) {
2328 my $key = "$_[0]/$_[1]";
2329
2330 cf::sync_job {
2331 BDB::db_get $DB, undef, $key, my $data;
2332
2333 $! ? ()
2334 : $data
2335 }
2336}
2337
2338sub db_put($$$) {
2339 BDB::dbreq_pri 4;
2340 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2341}
2342
2343=item cf::cache $id => [$paths...], $processversion => $process
2344
2345Generic caching function that returns the value of the resource $id,
2346caching and regenerating as required.
2347
2348This function can block.
2349
2350=cut
2351
2352sub cache {
2353 my ($id, $src, $processversion, $process) = @_;
2354
2355 my $meta =
2356 join "\x00",
2357 $processversion,
2358 map {
2359 aio_stat $_
2360 and Carp::croak "$_: $!";
2361
2362 ($_, (stat _)[7,9])
2363 } @$src;
2364
2365 my $dbmeta = db_get cache => "$id/meta";
2366 if ($dbmeta ne $meta) {
2367 # changed, we may need to process
2368
2369 my @data;
2370 my $md5;
2371
2372 for (0 .. $#$src) {
2373 0 <= aio_load $src->[$_], $data[$_]
2374 or Carp::croak "$src->[$_]: $!";
2375 }
2376
2377 # if processing is expensive, check
2378 # checksum first
2379 if (1) {
2380 $md5 =
2381 join "\x00",
2382 $processversion,
2383 map {
2384 Coro::cede;
2385 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2386 } 0.. $#$src;
2387
2388
2389 my $dbmd5 = db_get cache => "$id/md5";
2390 if ($dbmd5 eq $md5) {
2391 db_put cache => "$id/meta", $meta;
2392
2393 return db_get cache => "$id/data";
2394 }
2395 }
2396
2397 my $t1 = Time::HiRes::time;
2398 my $data = $process->(\@data);
2399 my $t2 = Time::HiRes::time;
2400
2401 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2402
2403 db_put cache => "$id/data", $data;
2404 db_put cache => "$id/md5" , $md5;
2405 db_put cache => "$id/meta", $meta;
2406
2407 return $data;
2408 }
2409
2410 db_get cache => "$id/data"
2411}
2412
2413=item fork_call { }, $args
2414
2415Executes the given code block with the given arguments in a seperate
2416process, returning the results. Everything must be serialisable with
2417Coro::Storable. May, of course, block. Note that the executed sub may
2418never block itself or use any form of Event handling.
2419
2420=cut
2421
2422sub fork_call(&@) {
2423 my ($cb, @args) = @_;
2424
2425# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2426# or die "socketpair: $!";
2427 pipe my $fh1, my $fh2
2428 or die "pipe: $!";
2429
2430 if (my $pid = fork) {
2431 close $fh2;
2432
2433 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2434 $res = Coro::Storable::thaw $res;
2435
2436 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2437
2438 die $$res unless "ARRAY" eq ref $res;
2439
2440 return wantarray ? @$res : $res->[-1];
2441 } else {
2442 local $SIG{__WARN__};
2443 eval {
2444 local $SIG{__DIE__};
2445 close $fh1;
2446
2447 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 };
2450
2451 warn $@ if $@;
2452 _exit 0;
2453 }
2454}
2455
2456
2457
2458#############################################################################
2459# the server's init and main functions 2836# the server's init and main functions
2460 2837
2461sub load_facedata($) { 2838sub load_facedata($) {
2462 my ($path) = @_; 2839 my ($path) = @_;
2840
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2463 2842
2464 warn "loading facedata from $path\n"; 2843 warn "loading facedata from $path\n";
2465 2844
2466 my $facedata; 2845 my $facedata;
2467 0 < aio_load $path, $facedata 2846 0 < aio_load $path, $facedata
2470 $facedata = Coro::Storable::thaw $facedata; 2849 $facedata = Coro::Storable::thaw $facedata;
2471 2850
2472 $facedata->{version} == 2 2851 $facedata->{version} == 2
2473 or cf::cleanup "$path: version mismatch, cannot proceed."; 2852 or cf::cleanup "$path: version mismatch, cannot proceed.";
2474 2853
2854 # patch in the exptable
2855 $facedata->{resource}{"res/exp_table"} = {
2856 type => FT_RSRC,
2857 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2858 };
2859 cf::cede_to_tick;
2860
2475 { 2861 {
2476 my $faces = $facedata->{faceinfo}; 2862 my $faces = $facedata->{faceinfo};
2477 2863
2478 while (my ($face, $info) = each %$faces) { 2864 while (my ($face, $info) = each %$faces) {
2479 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2865 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2480 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2866 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap};
2481 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2868 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2482 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2869 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2483 Coro::cede; 2870
2871 cf::cede_to_tick;
2484 } 2872 }
2485 2873
2486 while (my ($face, $info) = each %$faces) { 2874 while (my ($face, $info) = each %$faces) {
2487 next unless $info->{smooth}; 2875 next unless $info->{smooth};
2488 my $idx = cf::face::find $face 2876 my $idx = cf::face::find $face
2489 or next; 2877 or next;
2490 if (my $smooth = cf::face::find $info->{smooth}) { 2878 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth;
2491 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2492 } else { 2881 } else {
2493 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2882 warn "smooth face '$info->{smooth}' not found for face '$face'";
2494 } 2883 }
2495 Coro::cede; 2884
2885 cf::cede_to_tick;
2496 } 2886 }
2497 } 2887 }
2498 2888
2499 { 2889 {
2500 my $anims = $facedata->{animinfo}; 2890 my $anims = $facedata->{animinfo};
2501 2891
2502 while (my ($anim, $info) = each %$anims) { 2892 while (my ($anim, $info) = each %$anims) {
2503 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2893 cf::anim::set $anim, $info->{frames}, $info->{facings};
2504 Coro::cede; 2894 cf::cede_to_tick;
2505 } 2895 }
2506 2896
2507 cf::anim::invalidate_all; # d'oh 2897 cf::anim::invalidate_all; # d'oh
2508 } 2898 }
2509 2899
2900 {
2901 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource};
2904
2905 my $soundconf = delete $res->{"res/sound.conf"};
2906
2907 while (my ($name, $info) = each %$res) {
2908 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909 my $data;
2910
2911 if ($info->{type} & 1) {
2912 # prepend meta info
2913
2914 my $meta = $enc->encode ({
2915 name => $name,
2916 %{ $info->{meta} || {} },
2917 });
2918
2919 $data = pack "(w/a*)*", $meta, $info->{data};
2920 } else {
2921 $data = $info->{data};
2922 }
2923
2924 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925 cf::face::set_type $idx, $info->{type};
2926
2927 cf::cede_to_tick;
2928 }
2929
2930 if ($soundconf) {
2931 $soundconf = $enc->decode (delete $soundconf->{data});
2932
2933 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934 my $sound = $soundconf->{compat}[$_]
2935 or next;
2936
2937 my $face = cf::face::find "sound/$sound->[1]";
2938 cf::sound::set $sound->[0] => $face;
2939 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940 }
2941
2942 while (my ($k, $v) = each %{$soundconf->{event}}) {
2943 my $face = cf::face::find "sound/$v";
2944 cf::sound::set $k => $face;
2945 }
2946 }
2947 }
2948
2510 1 2949 1
2511} 2950}
2951
2952register_exticmd fx_want => sub {
2953 my ($ns, $want) = @_;
2954
2955 while (my ($k, $v) = each %$want) {
2956 $ns->fx_want ($k, $v);
2957 }
2958};
2512 2959
2513sub reload_regions { 2960sub reload_regions {
2514 load_resource_file "$MAPDIR/regions" 2961 load_resource_file "$MAPDIR/regions"
2515 or die "unable to load regions file\n"; 2962 or die "unable to load regions file\n";
2963
2964 for (cf::region::list) {
2965 $_->{match} = qr/$_->{match}/
2966 if exists $_->{match};
2967 }
2516} 2968}
2517 2969
2518sub reload_facedata { 2970sub reload_facedata {
2519 load_facedata "$DATADIR/facedata" 2971 load_facedata "$DATADIR/facedata"
2520 or die "unable to load facedata\n"; 2972 or die "unable to load facedata\n";
2521} 2973}
2522 2974
2523sub reload_archetypes { 2975sub reload_archetypes {
2524 load_resource_file "$DATADIR/archetypes" 2976 load_resource_file "$DATADIR/archetypes"
2525 or die "unable to load archetypes\n"; 2977 or die "unable to load archetypes\n";
2978 #d# NEED to laod twice to resolve forward references
2979 # this really needs to be done in an extra post-pass
2980 # (which needs to be synchronous, so solve it differently)
2981 load_resource_file "$DATADIR/archetypes"
2982 or die "unable to load archetypes\n";
2526} 2983}
2527 2984
2528sub reload_treasures { 2985sub reload_treasures {
2529 load_resource_file "$DATADIR/treasures" 2986 load_resource_file "$DATADIR/treasures"
2530 or die "unable to load treasurelists\n"; 2987 or die "unable to load treasurelists\n";
2533sub reload_resources { 2990sub reload_resources {
2534 warn "reloading resource files...\n"; 2991 warn "reloading resource files...\n";
2535 2992
2536 reload_regions; 2993 reload_regions;
2537 reload_facedata; 2994 reload_facedata;
2995 #reload_archetypes;#d#
2538 reload_archetypes; 2996 reload_archetypes;
2539 reload_treasures; 2997 reload_treasures;
2540 2998
2541 warn "finished reloading resource files\n"; 2999 warn "finished reloading resource files\n";
2542} 3000}
2543 3001
2544sub init { 3002sub init {
2545 reload_resources; 3003 reload_resources;
2546} 3004}
2547 3005
2548sub cfg_load { 3006sub reload_config {
2549 open my $fh, "<:utf8", "$CONFDIR/config" 3007 open my $fh, "<:utf8", "$CONFDIR/config"
2550 or return; 3008 or return;
2551 3009
2552 local $/; 3010 local $/;
2553 *CFG = YAML::Syck::Load <$fh>; 3011 *CFG = YAML::Syck::Load <$fh>;
2573 (async { 3031 (async {
2574 Event::one_event; 3032 Event::one_event;
2575 })->prio (Coro::PRIO_MAX); 3033 })->prio (Coro::PRIO_MAX);
2576 }; 3034 };
2577 3035
2578 cfg_load; 3036 reload_config;
2579 db_init; 3037 db_init;
2580 load_extensions; 3038 load_extensions;
2581 3039
2582 $TICK_WATCHER->start; 3040 $TICK_WATCHER->start;
2583 Event::loop; 3041 Event::loop;
2599 }, 3057 },
2600 ); 3058 );
2601 } 3059 }
2602} 3060}
2603 3061
3062sub write_runtime {
3063 my $runtime = "$LOCALDIR/runtime";
3064
3065 # first touch the runtime file to show we are still running:
3066 # the fsync below can take a very very long time.
3067
3068 IO::AIO::aio_utime $runtime, undef, undef;
3069
3070 my $guard = cf::lock_acquire "write_runtime";
3071
3072 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3073 or return;
3074
3075 my $value = $cf::RUNTIME + 90 + 10;
3076 # 10 is the runtime save interval, for a monotonic clock
3077 # 60 allows for the watchdog to kill the server.
3078
3079 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3080 and return;
3081
3082 # always fsync - this file is important
3083 aio_fsync $fh
3084 and return;
3085
3086 # touch it again to show we are up-to-date
3087 aio_utime $fh, undef, undef;
3088
3089 close $fh
3090 or return;
3091
3092 aio_rename "$runtime~", $runtime
3093 and return;
3094
3095 warn "runtime file written.\n";
3096
3097 1
3098}
3099
2604sub emergency_save() { 3100sub emergency_save() {
2605 my $freeze_guard = cf::freeze_mainloop; 3101 my $freeze_guard = cf::freeze_mainloop;
2606 3102
2607 warn "enter emergency perl save\n"; 3103 warn "enter emergency perl save\n";
2608 3104
2683 %EXT_CORO = (); 3179 %EXT_CORO = ();
2684 3180
2685 warn "removing commands"; 3181 warn "removing commands";
2686 %COMMAND = (); 3182 %COMMAND = ();
2687 3183
2688 warn "removing ext commands"; 3184 warn "removing ext/exti commands";
2689 %EXTCMD = (); 3185 %EXTCMD = ();
3186 %EXTICMD = ();
2690 3187
2691 warn "unloading/nuking all extensions"; 3188 warn "unloading/nuking all extensions";
2692 for my $pkg (@EXTS) { 3189 for my $pkg (@EXTS) {
2693 warn "... unloading $pkg"; 3190 warn "... unloading $pkg";
2694 3191
2737 warn "reloading cf.pm"; 3234 warn "reloading cf.pm";
2738 require cf; 3235 require cf;
2739 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2740 3237
2741 warn "loading config and database again"; 3238 warn "loading config and database again";
2742 cf::cfg_load; 3239 cf::reload_config;
2743 3240
2744 warn "loading extensions"; 3241 warn "loading extensions";
2745 cf::load_extensions; 3242 cf::load_extensions;
2746 3243
2747 warn "reattaching attachments to objects/players"; 3244 warn "reattaching attachments to objects/players";
2812 my $signal = new Coro::Signal; 3309 my $signal = new Coro::Signal;
2813 push @WAIT_FOR_TICK_BEGIN, $signal; 3310 push @WAIT_FOR_TICK_BEGIN, $signal;
2814 $signal->wait; 3311 $signal->wait;
2815} 3312}
2816 3313
3314 my $min = 1e6;#d#
3315 my $avg = 10;
2817$TICK_WATCHER = Event->timer ( 3316$TICK_WATCHER = Event->timer (
2818 reentrant => 0, 3317 reentrant => 0,
2819 parked => 1, 3318 parked => 1,
2820 prio => 0, 3319 prio => 0,
2821 at => $NEXT_TICK || $TICK, 3320 at => $NEXT_TICK || $TICK,
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3324 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10; 3325 unless ++$bug_warning > 10;
2827 return; 3326 return;
2828 } 3327 }
2829 3328
2830 $NOW = Event::time; 3329 $NOW = $tick_start = Event::time;
2831 3330
2832 cf::server_tick; # one server iteration 3331 cf::server_tick; # one server iteration
3332
3333 0 && sync_job {#d#
3334 for(1..10) {
3335 my $t = Event::time;
3336 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3337 or die;
3338
3339 $map->width (50);
3340 $map->height (50);
3341 $map->alloc;
3342 $map->_load_objects ("/tmp/x.map", 1);
3343 my $t = Event::time - $t;
3344
3345 #next unless $t < 0.0013;#d#
3346 if ($t < $min) {
3347 $min = $t;
3348 }
3349 $avg = $avg * 0.99 + $t * 0.01;
3350 }
3351 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3352 exit 0;
3353 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3354 };
2833 3355
2834 $RUNTIME += $TICK; 3356 $RUNTIME += $TICK;
2835 $NEXT_TICK += $TICK; 3357 $NEXT_TICK += $TICK;
2836 3358
2837 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3359 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2843 } 3365 }
2844 3366
2845# my $AFTER = Event::time; 3367# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d# 3368# warn $AFTER - $NOW;#d#
2847 3369
3370 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3371 $sig->send;
3372 }
3373 while (my $sig = shift @WAIT_FOR_TICK) {
3374 $sig->send;
3375 }
3376
3377 $NOW = Event::time;
3378
2848 # if we are delayed by four ticks or more, skip them all 3379 # if we are delayed by four ticks or more, skip them all
2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3380 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2850 3381
2851 $TICK_WATCHER->at ($NEXT_TICK); 3382 $TICK_WATCHER->at ($NEXT_TICK);
2852 $TICK_WATCHER->start; 3383 $TICK_WATCHER->start;
2853 3384
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3385 $LOAD = ($NOW - $tick_start) / $TICK;
2855 $sig->send; 3386 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860 3387
2861 _post_tick; 3388 _post_tick;
3389
3390
2862 }, 3391 },
2863); 3392);
2864 3393
2865{ 3394{
2866 BDB::max_poll_time $TICK * 0.1; 3395 BDB::max_poll_time $TICK * 0.1;
2925 prio => 6, 3454 prio => 6,
2926 cb => \&IO::AIO::poll_cb, 3455 cb => \&IO::AIO::poll_cb,
2927 ); 3456 );
2928} 3457}
2929 3458
3459my $_log_backtrace;
3460
3461sub _log_backtrace {
3462 my ($msg, @addr) = @_;
3463
3464 $msg =~ s/\n//;
3465
3466 # limit the # of concurrent backtraces
3467 if ($_log_backtrace < 2) {
3468 ++$_log_backtrace;
3469 async {
3470 my @bt = fork_call {
3471 @addr = map { sprintf "%x", $_ } @addr;
3472 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3473 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3474 or die "addr2line: $!";
3475
3476 my @funcs;
3477 my @res = <$fh>;
3478 chomp for @res;
3479 while (@res) {
3480 my ($func, $line) = splice @res, 0, 2, ();
3481 push @funcs, "[$func] $line";
3482 }
3483
3484 @funcs
3485 };
3486
3487 LOG llevInfo, "[ABT] $msg\n";
3488 LOG llevInfo, "[ABT] $_\n" for @bt;
3489 --$_log_backtrace;
3490 };
3491 } else {
3492 LOG llevInfo, "[ABT] $msg\n";
3493 LOG llevInfo, "[ABT] [suppressed]\n";
3494 }
3495}
3496
2930# load additional modules 3497# load additional modules
2931use cf::pod; 3498use cf::pod;
2932 3499
2933END { cf::emergency_save } 3500END { cf::emergency_save }
2934 3501

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines