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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.396 by root, Wed Nov 14 08:09:46 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
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42 42
43# 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?
44$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
45 45
46$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
78our $NEXT_TICK; 78our $NEXT_TICK;
79our $NOW; 79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
81 81
82our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 86our $DB_ENV;
84 87
85our %CFG; 88our %CFG;
86 89
87our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 91our $RUNTIME;
89 92
90our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
93 96
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 99
157 160
158The raw value load value from the last tick. 161The raw value load value from the last tick.
159 162
160=item %cf::CFG 163=item %cf::CFG
161 164
162Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 166from wherever your confdir points to.
164 167
165=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
166 169
167These 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
168returns 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
169per 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.
170 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
171=back 180=back
172 181
173=cut 182=cut
174 183
175BEGIN { 184BEGIN {
179 $msg .= "\n" 188 $msg .= "\n"
180 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
181 190
182 $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;
183 192
184 utf8::encode $msg;
185 LOG llevError, $msg; 193 LOG llevError, $msg;
186 }; 194 };
187} 195}
188 196
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205)) { 213)) {
206 no strict 'refs'; 214 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 216}
209 217
210$Event::DIED = sub { 218$EV::DIED = sub {
211 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
212}; 220};
213 221
214############################################################################# 222#############################################################################
215 223
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock 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
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
274Return 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.
275 286
276=cut 287=cut
277 288
278our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
279 291
280sub lock_wait($) { 292sub lock_wait($) {
281 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#
282 299
283 # wait for lock, if any 300 # wait for lock, if any
284 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 303 Coro::schedule;
292 309
293 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
294 lock_wait $key; 311 lock_wait $key;
295 312
296 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
297 315
298 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
301 } 320 }
302} 321}
303 322
315 }; 334 };
316 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
317 $guard 336 $guard
318} 337}
319 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
320=item cf::async { BLOCK } 412=item cf::async { BLOCK }
321 413
322Currently the same as Coro::async_pool, meaning you cannot use 414Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 416thing you are allowed to do is call C<prio> on it.
327 419
328BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
329 421
330=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
331 423
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 427acceptable.
336 428
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
343 435
344sub sync_job(&) { 436sub sync_job(&) {
345 my ($job) = @_; 437 my ($job) = @_;
346 438
347 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 440 my $time = EV::time;
349 441
350 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
352 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
353 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 448 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
356 450
357 my $busy = 1; 451 my $busy = 1;
358 my @res; 452 my @res;
359 453
360 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 456 @res = eval { $job->() };
362 warn $@ if $@; 457 warn $@ if $@;
363 undef $busy; 458 undef $busy;
364 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
365 460
366 while ($busy) { 461 while ($busy) {
367 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
368 } 466 }
467 }
369 468
370 $time = Event::time - $time; 469 $time = EV::time - $time;
371 470
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 473
375 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 504=item fork_call { }, $args
406 505
407Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
411 510
412=cut 511=cut
413 512
414sub fork_call(&@) { 513sub fork_call(&@) {
415 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
416 515
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 516 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 517 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 518 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 519
422 if (my $pid = fork) { 520 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 521 reset_signals;
435 local $SIG{__WARN__}; 522 &$cb
436 local $SIG{__DIE__}; 523 }, @args;
437 eval {
438 close $fh1;
439 524
440 my @res = eval { $cb->(@args) }; 525 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 526}
448 527
449=item $value = cf::db_get $family => $key 528=item $value = cf::db_get $family => $key
450 529
451Returns a single value from the environment database. 530Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
454 533
455Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
458=cut 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}
459 560
460our $DB; 561our $DB;
461 562
462sub db_init { 563sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 564 cf::sync_job {
467 eval { 565 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 566 };
477} 567}
478 568
479sub db_get($$) { 569sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
481 571
531 if (1) { 621 if (1) {
532 $md5 = 622 $md5 =
533 join "\x00", 623 join "\x00",
534 $processversion, 624 $processversion,
535 map { 625 map {
536 Coro::cede; 626 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 628 } 0.. $#$src;
539 629
540 630
541 my $dbmd5 = db_get cache => "$id/md5"; 631 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
587 677
588In 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>
589C<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
590Crossfire TRT). 680Deliantra).
591 681
592=over 4 682=over 4
593 683
594=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
595 685
847 "; 937 ";
848 die if $@; 938 die if $@;
849} 939}
850 940
851our $override; 941our $override;
852our @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?
853 943
854sub override { 944sub override {
855 $override = 1; 945 $override = 1;
856 @invoke_results = (); 946 @INVOKE_RESULTS = (@_);
857} 947}
858 948
859sub do_invoke { 949sub do_invoke {
860 my $event = shift; 950 my $event = shift;
861 my $callbacks = shift; 951 my $callbacks = shift;
862 952
863 @invoke_results = (); 953 @INVOKE_RESULTS = ();
864 954
865 local $override; 955 local $override;
866 956
867 for (@$callbacks) { 957 for (@$callbacks) {
868 eval { &{$_->[1]} }; 958 eval { &{$_->[1]} };
885 975
886Generate an object-specific event with the given arguments. 976Generate an object-specific event with the given arguments.
887 977
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 980results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 981
892=back 982=back
893 983
894=cut 984=cut
895 985
896############################################################################# 986#############################################################################
897# 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}
898 1030
899sub reattach { 1031sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1033 my ($obj) = @_;
902 1034
949sub object_freezer_save { 1081sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
951 1083
952 sync_job { 1084 sync_job {
953 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
956 1089
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1094 close $fh;
962 1095
963 if (@$objs) { 1096 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1102 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
971 } 1104 }
979 } 1112 }
980 } else { 1113 } else {
981 aio_unlink $filename; 1114 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
983 } 1116 }
984 } 1117 };
985} 1118}
986 1119
987sub object_freezer_as_string { 1120sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
989 1122
1001 or return; 1134 or return;
1002 1135
1003 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1138 or return;
1139
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1007 } 1142 }
1008 1143
1144 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
1011 return ($data, $av); 1148 ($data, $av)
1012} 1149}
1013 1150
1014=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
1015 1152
1016=over 4 1153=over 4
1089 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
1090 1227
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1229
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
1099 } else { 1245 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1247 }
1102 1248
1103 cf::override; 1249 cf::override;
1193 1339
1194=head3 cf::player 1340=head3 cf::player
1195 1341
1196=over 4 1342=over 4
1197 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}
1357
1198=item cf::player::find $login 1358=item cf::player::find $login
1199 1359
1200Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1201 1361
1202=cut 1362=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1401
1242 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1245 } 1410 }
1246 } 1411 }
1247} 1412}
1248 1413
1258 1423
1259 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1261 1426
1262 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1263 Coro::cede; 1428 cf::cede_to_tick;
1264} 1429}
1265 1430
1266sub new($) { 1431sub new($) {
1267 my ($login) = @_; 1432 my ($login) = @_;
1268 1433
1272 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1273 1438
1274 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1275 1440
1276 $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 (@_);
1277} 1452}
1278 1453
1279=item $pl->quit_character 1454=item $pl->quit_character
1280 1455
1281Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1511 or return [];
1337 1512
1338 my @logins; 1513 my @logins;
1339 1514
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1344 1524
1345 utf8::decode $login; 1525 utf8::decode $login;
1346 push @logins, $login; 1526 push @logins, $login;
1347 } 1527 }
1348 1528
1381 1561
1382Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1383 1563
1384=cut 1564=cut
1385 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
1386sub expand_cfpod { 1577sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1388 1579
1389 # escape & and < 1580 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1581
1393 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1394 1585
1395 1 while 1586 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1591 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1592 <
1402 $self->gender ? $2 : $1 1593 (?:
1403 }ge 1594 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1595 | < $interior >
1405 || s{H<([^\>]*)>} 1596 )
1597 >
1598 %gcsx
1406 { 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") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1619 "")
1410 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1412 1631
1632 for ($xml) {
1413 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1415 1635
1416 # compress some whitespace 1636 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 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 }
1418 1642
1419 $_ 1643 $xml
1420} 1644}
1645
1646no re 'eval';
1421 1647
1422sub hintmode { 1648sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1650 $_[0]{hintmode}
1426} 1651}
1427 1652
1428=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1429 1654
1430Sends an ext reply to the player. 1655Sends an ext reply to the player.
1431 1656
1432=cut 1657=cut
1433 1658
1434sub ext_reply($$%) { 1659sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1436 1661
1437 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1663}
1440 1664
1441=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1442 1666
1443Sends an ext event to the client. 1667Sends an ext event to the client.
1444 1668
1445=cut 1669=cut
1446 1670
1447sub ext_event($$%) { 1671sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1449 1673
1450 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1451} 1675}
1452 1676
1453=head3 cf::region 1677=head3 cf::region
1454 1678
1455=over 4 1679=over 4
1468 my ($path) = @_; 1692 my ($path) = @_;
1469 1693
1470 my ($match, $specificity); 1694 my ($match, $specificity);
1471 1695
1472 for my $region (list) { 1696 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1697 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1698 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1699 if $region->specificity > $specificity;
1476 } 1700 }
1477 } 1701 }
1478 1702
1598 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1599 return $self; 1823 return $self;
1600 } 1824 }
1601 } 1825 }
1602 1826
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1828 ()
1605} 1829}
1606 1830
1607sub init { 1831sub init {
1608 my ($self) = @_; 1832 my ($self) = @_;
1671 1895
1672sub load_header_from($) { 1896sub load_header_from($) {
1673 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1674 1898
1675 utf8::encode $path; 1899 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1908
1682 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1683 1910
1684 1 1911 1
1685} 1912}
1739sub find { 1966sub find {
1740 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1741 1968
1742 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1743 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1745 1973
1746 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1747 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
1748 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1749 or return; 1979 or return;
1750 1980
1751 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1752 1982
1754 or return; 1984 or return;
1755 1985
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1759 $map->reset; 1991 $map->reset;
1760 undef $guard;
1761 return find $path; 1992 return find $path;
1762 } 1993 }
1763 1994
1764 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1765 } 1996 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1775 2006
1776 my $path = $self->{path}; 2007 my $path = $self->{path};
1777 2008
1778 { 2009 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1780 2011
2012 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 2014
1783 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1784 2016
1785 $self->alloc; 2017 $self->alloc;
1786 2018
1787 $self->pre_load; 2019 $self->pre_load;
1788 Coro::cede; 2020 cf::cede_to_tick;
1789 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1791 or return; 2025 or return;
1792 2026
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1795 2029
1796 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 2031 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 2034 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1801 } 2038 }
1802 } 2039 }
1803 2040
1804 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1805 # now do the right thing for maps 2044 # now do the right thing for maps
1806 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 2047 unless $self->difficulty;
1809 Coro::cede; 2048 cf::cede_to_tick;
1810 2049
1811 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 2051 $self->decay_objects;
1813 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1814 $self->update_buttons; 2053 $self->update_buttons;
1815 Coro::cede; 2054 cf::cede_to_tick;
1816 $self->set_darkness_map; 2055 $self->set_darkness_map;
1817 Coro::cede; 2056 cf::cede_to_tick;
1818 $self->activate; 2057 $self->activate;
1819 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1820 2062
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 2064 }
1823 2065
1824 $self->post_load; 2066 $self->post_load;
1835 2077
1836 $self 2078 $self
1837} 2079}
1838 2080
1839# 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
1840sub load_diag { 2082sub load_neighbours {
1841 my ($map) = @_; 2083 my ($map) = @_;
1842 2084
1843 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1844 2086
1845 for (0 .. 3) { 2087 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1847 or next; 2089 or next;
1848 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1849 or next; 2091 or next;
1850 $neigh->load; 2092 $neigh->load;
1851 2093
2094 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2097 }
1855 2098
1856 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1858 or next; 2102 or next;
1859 $neigh->load; 2103 $neigh->load;
1860 } 2104 }
1861} 2105}
1862 2106
1867} 2111}
1868 2112
1869sub do_load_sync { 2113sub do_load_sync {
1870 my ($map) = @_; 2114 my ($map) = @_;
1871 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1872 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1873} 2120}
1874 2121
1875our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1877 2124
1878sub find_async { 2125sub find_async {
1879 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1880 2127
1881 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1882 2129
1883 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2132 }
1886 2133
1887 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1888 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1889 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2141 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2142 $map->load if $v;
2143 }
1894 2144
1895 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1896 } 2146 }
1897 } 2147 }
1898 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1899 }; 2149 };
1900 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1903} 2153}
1904 2154
1905sub save { 2155sub save {
1906 my ($self) = @_; 2156 my ($self) = @_;
1907 2157
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2159
1910 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1911 2161
1912 return unless $self->dirty; 2162 return unless $self->dirty;
1913 2163
1919 return if $self->{deny_save}; 2169 return if $self->{deny_save};
1920 2170
1921 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
1922 2172
1923 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
1925 }; 2176 };
1926 2177
1927 if ($uniq) { 2178 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1936 my ($self) = @_; 2187 my ($self) = @_;
1937 2188
1938 # save first because save cedes 2189 # save first because save cedes
1939 $self->save; 2190 $self->save;
1940 2191
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2193
1943 return if $self->players; 2194 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2196 return if $self->{deny_save};
1946 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2202 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2203}
1950 2204
1951sub reset_at { 2205sub reset_at {
1952 my ($self) = @_; 2206 my ($self) = @_;
1953 2207
1985 if $uniq; 2239 if $uniq;
1986 } 2240 }
1987 2241
1988 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
1989 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2246 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2247
1994 $self->unlink_save; 2248 $self->unlink_save;
1995 $self->destroy; 2249 $self->destroy;
1996} 2250}
1997 2251
1998my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
1999 2253
2000sub nuke { 2254sub nuke {
2001 my ($self) = @_; 2255 my ($self) = @_;
2002 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
2003 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
2004 2261
2005 $self->unlink_save; 2262 $self->unlink_save;
2006 2263
2007 bless $self, "cf::map"; 2264 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2269
2013 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
2014 2272
2015 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
2016} 2274}
2017 2275
2018=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
2094 2352
2095sub inv_recursive { 2353sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2097} 2355}
2098 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
2099package cf; 2385package cf;
2100 2386
2101=back 2387=back
2102 2388
2103=head3 cf::object::player 2389=head3 cf::object::player
2125 2411
2126 } else { 2412 } else {
2127 my $pl = $self->contr; 2413 my $pl = $self->contr;
2128 2414
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2418
2138 } else { 2419 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2141 } 2422 }
2142 } 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 (@_);
2143} 2434}
2144 2435
2145=item $player_object->may ("access") 2436=item $player_object->may ("access")
2146 2437
2147Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2229 2520
2230 $map->load; 2521 $map->load;
2231 $map->load_diag; 2522 $map->load_neighbours;
2232 2523
2233 return unless $self->contr->active; 2524 return unless $self->contr->active;
2234 $self->activate_recursive; 2525 $self->activate_recursive;
2235 2526
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2238} 2529}
2239 2530
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2532
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2538
2247=cut 2539=cut
2248 2540
2249our $GOTOGEN; 2541our $GOTOGEN;
2250 2542
2251sub cf::object::player::goto { 2543sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2544 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2545
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2548
2257 $self->enter_link; 2549 $self->enter_link;
2258 2550
2259 (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
2260 my $map = eval { 2573 my $map = eval {
2261 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2262 2575
2263 if ($map) { 2576 if ($map) {
2264 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2266 } else { 2579 } else {
2267 $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);
2268 } 2581 }
2269 2582
2270 $map 2583 $map
2271 }; 2584 };
2272 2585
2277 2590
2278 if ($gen == $self->{_goto_generation}) { 2591 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2592 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2593 $self->leave_link ($map, $x, $y);
2281 } 2594 }
2595
2596 $done->() if $done;
2282 })->prio (1); 2597 })->prio (1);
2283} 2598}
2284 2599
2285=item $player_object->enter_exit ($exit_object) 2600=item $player_object->enter_exit ($exit_object)
2286 2601
2355 my $hp = $exit->stats->hp; 2670 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2671 my $sp = $exit->stats->sp;
2357 2672
2358 $self->enter_link; 2673 $self->enter_link;
2359 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
2360 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2361 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2683 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2364 2685
2365 1; 2686 1;
2391 2712
2392 utf8::encode $text; 2713 utf8::encode $text;
2393 $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);
2394} 2715}
2395 2716
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2717=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2718
2398Send a drawinfo or msg packet to the client, formatting the msg for the 2719Send a drawinfo or msg packet to the client, formatting the msg for the
2399client if neccessary. C<$type> should be a string identifying the type of 2720client if neccessary. C<$type> should be a string identifying the type of
2400the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2401the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2402 2723
2403=cut 2724=cut
2404 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
2405sub cf::client::send_msg { 2778sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2780
2408 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2410 if ($self->can_msg) { 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
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2812 $self->send_packet ("msg " . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2814 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 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
2424 if (0 && $msg =~ /\[/) { 2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2833 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2835 $self->send_packet ("drawinfo $color $msg")
2429 } 2836 }
2430 } 2837 }
2431 } 2838 }
2432} 2839}
2433 2840
2434=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2435 2842
2436Sends an ext event to the client. 2843Sends an ext event to the client.
2437 2844
2438=cut 2845=cut
2439 2846
2440sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2442 2849
2850 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2445} 2874}
2446 2875
2447=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2448 2877
2449Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 2933 my ($ns, $buf) = @_;
2505 2934
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2936
2508 if (ref $msg) { 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
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2945 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2946 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2515 } else { 2952 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 2954 }
2518 2955
2519 cf::override; 2956 cf::override;
2566our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2568 3005
2569$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2570 3007
2571$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));
2572 3013
2573# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2574 3015
2575=pod 3016=pod
2576 3017
2577The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2578 3019
2579 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
2580 cf::object::player player 3024 cf::object::player
2581 cf::player peaceful 3025 player
2582 cf::map trigger 3026
3027 cf::player
3028 peaceful
3029
3030 cf::map
3031 trigger
2583 3032
2584=cut 3033=cut
2585 3034
2586for ( 3035for (
2587 ["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)],
2588 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2591) { 3042) {
2592 no strict 'refs'; 3043 no strict 'refs';
2668# the server's init and main functions 3119# the server's init and main functions
2669 3120
2670sub load_facedata($) { 3121sub load_facedata($) {
2671 my ($path) = @_; 3122 my ($path) = @_;
2672 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;
3129
2673 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2674 3131
2675 my $facedata; 3132 my $facedata;
2676 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3134 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2680 3137
2681 $facedata->{version} == 2 3138 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3139 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 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
2684 { 3148 {
2685 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2686 3150
2687 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3153 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3157
3158 cf::cede_to_tick;
2693 } 3159 }
2694 3160
2695 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3162 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 3163 my $idx = cf::face::find $face
2698 or next; 3164 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3165 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3168 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3169 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3170 }
2704 Coro::cede; 3171
3172 cf::cede_to_tick;
2705 } 3173 }
2706 } 3174 }
2707 3175
2708 { 3176 {
2709 my $anims = $facedata->{animinfo}; 3177 my $anims = $facedata->{animinfo};
2710 3178
2711 while (my ($anim, $info) = each %$anims) { 3179 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3180 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3181 cf::cede_to_tick;
2714 } 3182 }
2715 3183
2716 cf::anim::invalidate_all; # d'oh 3184 cf::anim::invalidate_all; # d'oh
2717 } 3185 }
2718 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
2719 1 3236 1
2720} 3237}
2721 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
2722sub 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
2723 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2724 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 }
2725} 3259}
2726 3260
2727sub reload_facedata { 3261sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3262 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3263 or die "unable to load facedata\n";
2758 3292
2759sub init { 3293sub init {
2760 reload_resources; 3294 reload_resources;
2761} 3295}
2762 3296
2763sub cfg_load { 3297sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3299 or return;
2766 3300
2767 local $/; 3301 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2784sub main { 3318sub main {
2785 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2787 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#
2788 (async { 3322 (async {
2789 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2790 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2791 }; 3326 };
2792 3327
2793 cfg_load; 3328 reload_config;
2794 db_init; 3329 db_init;
2795 load_extensions; 3330 load_extensions;
2796 3331
2797 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
2798 Event::loop; 3333 EV::loop;
2799} 3334}
2800 3335
2801############################################################################# 3336#############################################################################
2802# initialisation and cleanup 3337# initialisation and cleanup
2803 3338
2804# install some emergency cleanup handlers 3339# install some emergency cleanup handlers
2805BEGIN { 3340BEGIN {
3341 our %SIGWATCHER = ();
2806 for my $signal (qw(INT HUP TERM)) { 3342 for my $signal (qw(INT HUP TERM)) {
2807 Event->signal ( 3343 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2808 reentrant => 0,
2809 data => WF_AUTOCANCEL,
2810 signal => $signal,
2811 prio => 0,
2812 cb => sub {
2813 cf::cleanup "SIG$signal"; 3344 cf::cleanup "SIG$signal";
2814 },
2815 ); 3345 };
2816 } 3346 }
2817} 3347}
2818 3348
2819sub write_runtime { 3349sub write_runtime {
2820 my $runtime = "$LOCALDIR/runtime"; 3350 my $runtime = "$LOCALDIR/runtime";
2865 # and maps saved/destroyed asynchronously. 3395 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3396 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3397 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3398 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3399 $pl->valid or next;
3400 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3401 $pl->save;
2871 } 3402 }
2872 warn "end emergency player save\n"; 3403 warn "end emergency player save\n";
2873 3404
2874 warn "begin emergency map save\n"; 3405 warn "begin emergency map save\n";
2913 warn "syncing database to disk"; 3444 warn "syncing database to disk";
2914 BDB::db_env_txn_checkpoint $DB_ENV; 3445 BDB::db_env_txn_checkpoint $DB_ENV;
2915 3446
2916 # if anything goes wrong in here, we should simply crash as we already saved 3447 # if anything goes wrong in here, we should simply crash as we already saved
2917 3448
2918 warn "cancelling all WF_AUTOCANCEL watchers";
2919 for (Event::all_watchers) {
2920 $_->cancel if $_->data & WF_AUTOCANCEL;
2921 }
2922
2923 warn "flushing outstanding aio requests"; 3449 warn "flushing outstanding aio requests";
2924 for (;;) { 3450 for (;;) {
2925 BDB::flush; 3451 BDB::flush;
2926 IO::AIO::flush; 3452 IO::AIO::flush;
2927 Coro::cede; 3453 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3454 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3455 warn "iterate...";
2930 } 3456 }
2931 3457
2932 ++$RELOAD; 3458 ++$RELOAD;
2991 warn "reloading cf.pm"; 3517 warn "reloading cf.pm";
2992 require cf; 3518 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3519 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3520
2995 warn "loading config and database again"; 3521 warn "loading config and database again";
2996 cf::cfg_load; 3522 cf::reload_config;
2997 3523
2998 warn "loading extensions"; 3524 warn "loading extensions";
2999 cf::load_extensions; 3525 cf::load_extensions;
3000 3526
3001 warn "reattaching attachments to objects/players"; 3527 warn "reattaching attachments to objects/players";
3021 3547
3022sub reload_perl() { 3548sub reload_perl() {
3023 # doing reload synchronously and two reloads happen back-to-back, 3549 # doing reload synchronously and two reloads happen back-to-back,
3024 # coro crashes during coro_state_free->destroy here. 3550 # coro crashes during coro_state_free->destroy here.
3025 3551
3026 $RELOAD_WATCHER ||= Event->timer ( 3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3027 reentrant => 0,
3028 after => 0,
3029 data => WF_AUTOCANCEL,
3030 cb => sub {
3031 do_reload_perl;
3032 undef $RELOAD_WATCHER; 3553 undef $RELOAD_WATCHER;
3033 }, 3554 do_reload_perl;
3034 ); 3555 };
3035} 3556}
3036 3557
3037register_command "reload" => sub { 3558register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3559 my ($who, $arg) = @_;
3039 3560
3040 if ($who->flag (FLAG_WIZ)) { 3561 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3562 $who->message ("reloading server.");
3563 async {
3564 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3565 reload_perl;
3566 };
3043 } 3567 }
3044}; 3568};
3045 3569
3046unshift @INC, $LIBDIR; 3570unshift @INC, $LIBDIR;
3047 3571
3066 my $signal = new Coro::Signal; 3590 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3591 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3592 $signal->wait;
3069} 3593}
3070 3594
3071 my $min = 1e6;#d# 3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer (
3074 reentrant => 0,
3075 parked => 1,
3076 prio => 0,
3077 at => $NEXT_TICK || $TICK,
3078 data => WF_AUTOCANCEL,
3079 cb => sub {
3080 if ($Coro::current != $Coro::main) { 3596 if ($Coro::current != $Coro::main) {
3081 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3597 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3082 unless ++$bug_warning > 10; 3598 unless ++$bug_warning > 10;
3083 return; 3599 return;
3084 } 3600 }
3085 3601
3086 $NOW = $tick_start = Event::time; 3602 $NOW = $tick_start = EV::now;
3087 3603
3088 cf::server_tick; # one server iteration 3604 cf::server_tick; # one server iteration
3089 3605
3090 0 && sync_job {#d# 3606 $RUNTIME += $TICK;
3091 for(1..10) { 3607 $NEXT_TICK += $TICK;
3092 my $t = Event::time;
3093 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3094 or die;
3095 3608
3096 $map->width (50); 3609 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3097 $map->height (50); 3610 $NEXT_RUNTIME_WRITE = $NOW + 10;
3098 $map->alloc; 3611 Coro::async_pool {
3099 $map->_load_objects ("/tmp/x.map", 1); 3612 $Coro::current->{desc} = "runtime saver";
3100 my $t = Event::time - $t; 3613 write_runtime
3101 3614 or warn "ERROR: unable to write runtime file: $!";
3102 #next unless $t < 0.0013;#d#
3103 if ($t < $min) {
3104 $min = $t;
3105 }
3106 $avg = $avg * 0.99 + $t * 0.01;
3107 }
3108 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109 exit 0;
3110 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111 }; 3615 };
3616 }
3112 3617
3113 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK;
3115
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool {
3119 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!";
3121 };
3122 }
3123
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3619 $sig->send;
3129 } 3620 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3621 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3622 $sig->send;
3132 } 3623 }
3133 3624
3134 $NOW = Event::time;
3135
3136 # if we are delayed by four ticks or more, skip them all
3137 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3138
3139 $TICK_WATCHER->at ($NEXT_TICK);
3140 $TICK_WATCHER->start;
3141
3142 $LOAD = ($NOW - $tick_start) / $TICK; 3625 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3627
3145 _post_tick; 3628 _post_tick;
3146 3629};
3147 3630$TICK_WATCHER->priority (EV::MAXPRI);
3148 },
3149);
3150 3631
3151{ 3632{
3633 BDB::min_parallel 8;
3152 BDB::max_poll_time $TICK * 0.1; 3634 BDB::max_poll_time $TICK * 0.1;
3153 $BDB_POLL_WATCHER = Event->io ( 3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3154 reentrant => 0,
3155 fd => BDB::poll_fileno,
3156 poll => 'r',
3157 prio => 0,
3158 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb,
3160 );
3161 BDB::min_parallel 8;
3162 3636
3163 BDB::set_sync_prepare { 3637 BDB::set_sync_prepare {
3164 my $status; 3638 my $status;
3165 my $current = $Coro::current; 3639 my $current = $Coro::current;
3166 ( 3640 (
3175 ) 3649 )
3176 }; 3650 };
3177 3651
3178 unless ($DB_ENV) { 3652 unless ($DB_ENV) {
3179 $DB_ENV = BDB::db_env_create; 3653 $DB_ENV = BDB::db_env_create;
3654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3655 | BDB::LOG_AUTOREMOVE, 1);
3656 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3657 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180 3658
3181 cf::sync_job { 3659 cf::sync_job {
3182 eval { 3660 eval {
3183 BDB::db_env_open 3661 BDB::db_env_open
3184 $DB_ENV, 3662 $DB_ENV,
3186 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3666 0666;
3189 3667
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3668 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3193 $DB_ENV->set_lk_detect;
3194 }; 3669 };
3195 3670
3196 cf::cleanup "db_env_open(db): $@" if $@; 3671 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3672 };
3198 } 3673 }
3674
3675 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3676 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3677 };
3678 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3679 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3680 };
3681 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 };
3199} 3684}
3200 3685
3201{ 3686{
3202 IO::AIO::min_parallel 8; 3687 IO::AIO::min_parallel 8;
3203 3688
3204 undef $Coro::AIO::WATCHER; 3689 undef $Coro::AIO::WATCHER;
3205 IO::AIO::max_poll_time $TICK * 0.1; 3690 IO::AIO::max_poll_time $TICK * 0.1;
3206 $AIO_POLL_WATCHER = Event->io ( 3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno,
3210 poll => 'r',
3211 prio => 6,
3212 cb => \&IO::AIO::poll_cb,
3213 );
3214} 3692}
3215 3693
3216my $_log_backtrace; 3694my $_log_backtrace;
3217 3695
3218sub _log_backtrace { 3696sub _log_backtrace {
3222 3700
3223 # limit the # of concurrent backtraces 3701 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3702 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3703 ++$_log_backtrace;
3226 async { 3704 async {
3705 $Coro::current->{desc} = "abt $msg";
3706
3227 my @bt = fork_call { 3707 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3708 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3709 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3710 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3231 or die "addr2line: $!"; 3711 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines