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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.400 by root, Mon Dec 17 06:36:34 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.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML::Syck ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43 43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
46 46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 79our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
82 81
83our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 86our $DB_ENV;
85 87
86our %CFG; 88our %CFG;
87 89
88our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 91our $RUNTIME;
92our $NOW;
90 93
91our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
94 97
95# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 100
158 161
159The raw value load value from the last tick. 162The raw value load value from the last tick.
160 163
161=item %cf::CFG 164=item %cf::CFG
162 165
163Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 167from wherever your confdir points to.
165 168
166=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
167 170
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 189 $msg .= "\n"
187 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
188 191
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 193
191 utf8::encode $msg;
192 LOG llevError, $msg; 194 LOG llevError, $msg;
193 }; 195 };
194} 196}
195 197
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212)) { 214)) {
213 no strict 'refs'; 215 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 217}
216 218
217$Event::DIED = sub { 219$EV::DIED = sub {
218 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
219}; 221};
220 222
221############################################################################# 223#############################################################################
222 224
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 248 $d
247 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
248} 250}
249 251
250=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
251 253
252Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
253 255
254=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
255 257
256Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
257 259
258=cut 260=cut
259 261
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 263
262sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
264 266
265=item cf::lock_wait $string 267=item cf::lock_wait $string
266 268
267Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
268 270
271Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
274returned. 276returned.
275 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
276Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
278 283
279=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
280 285
281Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
282 287
283=cut 288=cut
284 289
285our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
286 292
287sub lock_wait($) { 293sub lock_wait($) {
288 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
289 300
290 # wait for lock, if any 301 # wait for lock, if any
291 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 304 Coro::schedule;
299 310
300 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
301 lock_wait $key; 312 lock_wait $key;
302 313
303 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
304 316
305 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
308 } 321 }
309} 322}
310 323
322 }; 335 };
323 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
324 $guard 337 $guard
325} 338}
326 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
355=item cf::get_slot $time[, $priority[, $name]]
356
357Allocate $time seconds of blocking CPU time at priority C<$priority>:
358This call blocks and returns only when you have at least C<$time> seconds
359of cpu time till the next tick. The slot is only valid till the next cede.
360
361The optional C<$name> can be used to identify the job to run. It might be
362used for statistical purposes and should identify the same time-class.
363
364Useful for short background jobs.
365
366=cut
367
368our @SLOT_QUEUE;
369our $SLOT_QUEUE;
370
371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
375 my $signal = new Coro::Signal;
376
377 while () {
378 next_job:
379 my $avail = cf::till_tick;
380 if ($avail > 0.01) {
381 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) {
383 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send;
385 Coro::cede;
386 goto next_job;
387 }
388 }
389 }
390
391 if (@SLOT_QUEUE) {
392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
393 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait;
395 } else {
396 Coro::schedule;
397 }
398 }
399};
400
401sub get_slot($;$$) {
402 my ($time, $pri, $name) = @_;
403
404 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal;
406
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready;
410 $sig->wait;
411}
412
327=item cf::async { BLOCK } 413=item cf::async { BLOCK }
328 414
329Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 416C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
334 420
335BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
336 422
337=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
338 424
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 428acceptable.
343 429
344If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
345the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
350 436
351sub sync_job(&) { 437sub sync_job(&) {
352 my ($job) = @_; 438 my ($job) = @_;
353 439
354 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 441 my $time = EV::time;
356 442
357 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
359 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
360 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 449 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
363 451
364 my $busy = 1; 452 my $busy = 1;
365 my @res; 453 my @res;
366 454
367 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 457 @res = eval { $job->() };
369 warn $@ if $@; 458 warn $@ if $@;
370 undef $busy; 459 undef $busy;
371 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
372 461
373 while ($busy) { 462 while ($busy) {
374 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
375 } 467 }
468 }
376 469
377 $time = Event::time - $time; 470 $time = EV::time - $time;
378 471
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381 474
382 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
412=item fork_call { }, $args 505=item fork_call { }, $args
413 506
414Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
418 511
419=cut 512=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 513
430sub fork_call(&@) { 514sub fork_call(&@) {
431 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
432 516
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 517 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 518 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 519 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 520
438 if (my $pid = fork) { 521 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 522 reset_signals;
452 local $SIG{__WARN__}; 523 &$cb
453 local $SIG{__DIE__}; 524 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 525
460 eval { 526 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 527}
473 528
474=item $value = cf::db_get $family => $key 529=item $value = cf::db_get $family => $key
475 530
476Returns a single value from the environment database. 531Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
479 534
480Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
483=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
484 561
485our $DB; 562our $DB;
486 563
487sub db_init { 564sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 565 cf::sync_job {
492 eval { 566 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 567 };
502} 568}
503 569
504sub db_get($$) { 570sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
506 572
556 if (1) { 622 if (1) {
557 $md5 = 623 $md5 =
558 join "\x00", 624 join "\x00",
559 $processversion, 625 $processversion,
560 map { 626 map {
561 Coro::cede; 627 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 629 } 0.. $#$src;
564 630
565 631
566 my $dbmd5 = db_get cache => "$id/md5"; 632 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
612 678
613In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
614C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 681Deliantra).
616 682
617=over 4 683=over 4
618 684
619=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
620 686
918 984
919=cut 985=cut
920 986
921############################################################################# 987#############################################################################
922# object support 988# object support
923#
924 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
925sub _can_merge { 1023sub _can_merge {
926 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
927 1025
928 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1027
932 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
933} 1030}
934 1031
935sub reattach { 1032sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1034 my ($obj) = @_;
959cf::attachable->attach ( 1056cf::attachable->attach (
960 prio => -1000000, 1057 prio => -1000000,
961 on_instantiate => sub { 1058 on_instantiate => sub {
962 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
963 1060
964 $data = from_json $data; 1061 $data = decode_json $data;
965 1062
966 for (@$data) { 1063 for (@$data) {
967 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
968 1065
969 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1082sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
987 1084
988 sync_job { 1085 sync_job {
989 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
992 1090
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1095 close $fh;
998 1096
999 if (@$objs) { 1097 if (@$objs) {
1000 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1001 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1103 close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1105 }
1015 } 1113 }
1016 } else { 1114 } else {
1017 aio_unlink $filename; 1115 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1019 } 1117 }
1020 } 1118 };
1021} 1119}
1022 1120
1023sub object_freezer_as_string { 1121sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1025 1123
1037 or return; 1135 or return;
1038 1136
1039 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1139 or return;
1140
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1043 } 1143 }
1044 1144
1145 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1047 return ($data, $av); 1149 ($data, $av)
1048} 1150}
1049 1151
1050=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1051 1153
1052=over 4 1154=over 4
1125 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
1126 1228
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1230
1129 if (ref $msg) { 1231 if (ref $msg) {
1232 my ($type, $reply, @payload) =
1233 "ARRAY" eq ref $msg
1234 ? @$msg
1235 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1236
1237 my @reply;
1238
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
1135 } else { 1246 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1248 }
1138 1249
1139 cf::override; 1250 cf::override;
1229 1340
1230=head3 cf::player 1341=head3 cf::player
1231 1342
1232=over 4 1343=over 4
1233 1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1358
1234=item cf::player::find $login 1359=item cf::player::find $login
1235 1360
1236Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1237 1362
1238=cut 1363=cut
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1402
1278 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1281 } 1411 }
1282 } 1412 }
1283} 1413}
1284 1414
1294 1424
1295 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1297 1427
1298 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1299 Coro::cede; 1429 cf::cede_to_tick;
1300} 1430}
1301 1431
1302sub new($) { 1432sub new($) {
1303 my ($login) = @_; 1433 my ($login) = @_;
1304 1434
1308 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1309 1439
1310 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1311 1441
1312 $self 1442 $self
1443}
1444
1445=item $player->send_msg ($channel, $msg, $color, [extra...])
1446
1447=cut
1448
1449sub send_msg {
1450 my $ns = shift->ns
1451 or return;
1452 $ns->send_msg (@_);
1313} 1453}
1314 1454
1315=item $pl->quit_character 1455=item $pl->quit_character
1316 1456
1317Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1512 or return [];
1373 1513
1374 my @logins; 1514 my @logins;
1375 1515
1376 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1380 1525
1381 utf8::decode $login; 1526 utf8::decode $login;
1382 push @logins, $login; 1527 push @logins, $login;
1383 } 1528 }
1384 1529
1417 1562
1418Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1419 1564
1420=cut 1565=cut
1421 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1422sub expand_cfpod { 1578sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1424 1580
1425 # escape & and < 1581 my $xml;
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428 1582
1429 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1430 1586
1431 1 while 1587 $group =~ s/&/&amp;/g;
1432 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1436 # replace G<male|female> tags 1592 ([BCGHITU])
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1593 <
1438 $self->gender ? $2 : $1 1594 (?:
1439 }ge 1595 ([^<>]*) (?{ $group = $^N })
1440 # replace H<hint text> 1596 | < $interior >
1441 || s{H<([^\>]*)>} 1597 )
1598 >
1599 %gcsx
1442 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "") 1620 "")
1446 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1447 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1448 1632
1633 for ($xml) {
1449 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1451 1636
1452 # compress some whitespace 1637 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1457 1643
1458 $_ 1644 $xml
1459} 1645}
1646
1647no re 'eval';
1460 1648
1461sub hintmode { 1649sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1651 $_[0]{hintmode}
1464} 1652}
1465 1653
1466=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1467 1655
1468Sends an ext reply to the player. 1656Sends an ext reply to the player.
1469 1657
1470=cut 1658=cut
1471 1659
1472sub ext_reply($$%) { 1660sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1474 1662
1475 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1664}
1478 1665
1479=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1480 1667
1481Sends an ext event to the client. 1668Sends an ext event to the client.
1482 1669
1483=cut 1670=cut
1484 1671
1485sub ext_event($$%) { 1672sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1487 1674
1488 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1489} 1676}
1490 1677
1491=head3 cf::region 1678=head3 cf::region
1492 1679
1493=over 4 1680=over 4
1709 1896
1710sub load_header_from($) { 1897sub load_header_from($) {
1711 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1712 1899
1713 utf8::encode $path; 1900 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1719 1909
1720 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1721 1911
1722 1 1912 1
1723} 1913}
1777sub find { 1967sub find {
1778 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1779 1969
1780 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1781 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1783 1974
1784 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1786 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1787 or return; 1980 or return;
1788 1981
1789 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1790 1983
1792 or return; 1985 or return;
1793 1986
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1797 $map->reset; 1992 $map->reset;
1798 undef $guard;
1799 return find $path; 1993 return find $path;
1800 } 1994 }
1801 1995
1802 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1803 } 1997 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1813 2007
1814 my $path = $self->{path}; 2008 my $path = $self->{path};
1815 2009
1816 { 2010 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1818 2012
2013 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2015
1821 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1822 2017
1823 $self->alloc; 2018 $self->alloc;
1824 2019
1825 $self->pre_load; 2020 $self->pre_load;
1826 Coro::cede; 2021 cf::cede_to_tick;
1827 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1829 or return; 2026 or return;
1830 2027
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1833 2030
1834 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2032 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2035 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1839 } 2039 }
1840 } 2040 }
1841 2041
1842 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1843 # now do the right thing for maps 2045 # now do the right thing for maps
1844 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2048 unless $self->difficulty;
1847 Coro::cede; 2049 cf::cede_to_tick;
1848 2050
1849 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2052 $self->decay_objects;
1851 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1852 $self->update_buttons; 2054 $self->update_buttons;
1853 Coro::cede; 2055 cf::cede_to_tick;
1854 $self->set_darkness_map; 2056 $self->set_darkness_map;
1855 Coro::cede; 2057 cf::cede_to_tick;
1856 $self->activate; 2058 $self->activate;
1857 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1858 2063
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 2065 }
1861 2066
1862 $self->post_load; 2067 $self->post_load;
1873 2078
1874 $self 2079 $self
1875} 2080}
1876 2081
1877# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1878sub load_diag { 2083sub load_neighbours {
1879 my ($map) = @_; 2084 my ($map) = @_;
1880 2085
1881 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1882 2087
1883 for (0 .. 3) { 2088 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1885 or next; 2090 or next;
1886 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1887 or next; 2092 or next;
1888 $neigh->load; 2093 $neigh->load;
1889 2094
2095 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2098 }
1893 2099
1894 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1896 or next; 2103 or next;
1897 $neigh->load; 2104 $neigh->load;
1898 } 2105 }
1899} 2106}
1900 2107
1905} 2112}
1906 2113
1907sub do_load_sync { 2114sub do_load_sync {
1908 my ($map) = @_; 2115 my ($map) = @_;
1909 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1910 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1911} 2121}
1912 2122
1913our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1915 2125
1916sub find_async { 2126sub find_async {
1917 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1918 2128
1919 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1920 2130
1921 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2133 }
1924 2134
1925 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1926 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1927 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2142 if (my $map = find $k) {
1930 $map->load; 2143 $map->load if $v;
1931 } 2144 }
1932 2145
1933 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1934 } 2147 }
1935 } 2148 }
1936 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1937 }; 2150 };
1938 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
1941} 2154}
1942 2155
1943sub save { 2156sub save {
1944 my ($self) = @_; 2157 my ($self) = @_;
1945 2158
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2160
1948 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1949 2162
1950 return unless $self->dirty; 2163 return unless $self->dirty;
1951 2164
1957 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1958 2171
1959 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1960 2173
1961 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1963 }; 2177 };
1964 2178
1965 if ($uniq) { 2179 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2188 my ($self) = @_;
1975 2189
1976 # save first because save cedes 2190 # save first because save cedes
1977 $self->save; 2191 $self->save;
1978 2192
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2194
1981 return if $self->players; 2195 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1984 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2203 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2204}
1988 2205
1989sub reset_at { 2206sub reset_at {
1990 my ($self) = @_; 2207 my ($self) = @_;
1991 2208
2023 if $uniq; 2240 if $uniq;
2024 } 2241 }
2025 2242
2026 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2027 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2247 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2248
2032 $self->unlink_save; 2249 $self->unlink_save;
2033 $self->destroy; 2250 $self->destroy;
2034} 2251}
2035 2252
2036my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
2037 2254
2038sub nuke { 2255sub nuke {
2039 my ($self) = @_; 2256 my ($self) = @_;
2040 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2041 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
2042 2262
2043 $self->unlink_save; 2263 $self->unlink_save;
2044 2264
2045 bless $self, "cf::map"; 2265 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2270
2051 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
2052 2273
2053 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2054} 2275}
2055 2276
2056=item $maps = cf::map::tmp_maps 2277=item $maps = cf::map::tmp_maps
2132 2353
2133sub inv_recursive { 2354sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2135} 2356}
2136 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
2137package cf; 2386package cf;
2138 2387
2139=back 2388=back
2140 2389
2141=head3 cf::object::player 2390=head3 cf::object::player
2163 2412
2164 } else { 2413 } else {
2165 my $pl = $self->contr; 2414 my $pl = $self->contr;
2166 2415
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2419
2176 } else { 2420 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2179 } 2423 }
2180 } 2424 }
2425}
2426
2427=item $object->send_msg ($channel, $msg, $color, [extra...])
2428
2429=cut
2430
2431sub cf::object::send_msg {
2432 my $pl = shift->contr
2433 or return;
2434 $pl->send_msg (@_);
2181} 2435}
2182 2436
2183=item $player_object->may ("access") 2437=item $player_object->may ("access")
2184 2438
2185Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
2267 2521
2268 $map->load; 2522 $map->load;
2269 $map->load_diag; 2523 $map->load_neighbours;
2270 2524
2271 return unless $self->contr->active; 2525 return unless $self->contr->active;
2272 $self->activate_recursive; 2526 $self->activate_recursive;
2273 2527
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2549
2296 $self->enter_link; 2550 $self->enter_link;
2297 2551
2298 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2299 my $map = eval { 2574 my $map = eval {
2300 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2301 2576
2302 if ($map) { 2577 if ($map) {
2303 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2305 } else { 2580 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2582 }
2308 2583
2309 $map 2584 $map
2310 }; 2585 };
2311 2586
2364 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2365 } 2640 }
2366 2641
2367 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2368 2643
2369 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2370 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2372 2647
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2401 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2404 2679
2405 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2406 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2684 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2409 2686
2410 1; 2687 1;
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2447 2724
2448=cut 2725=cut
2449 2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2450sub cf::client::send_msg { 2779sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2781
2453 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2454 2783
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2457 if (ref $channel) { 2795 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2462 } 2801 }
2463 2802
2464 $channel = $channel->{id}; 2803 $channel = $channel->{id};
2465 } 2804 }
2466 2805
2467 return unless @extra || length $msg; 2806 return unless @extra || length $msg;
2468 2807
2469 if ($self->can_msg) { 2808 if ($self->can_msg) {
2809 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF;
2812
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2813 $self->send_packet ("msg " . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2815 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826
2827 $color &= cf::NDI_COLOR_MASK;
2828
2829 utf8::encode $msg;
2830
2483 if (0 && $msg =~ /\[/) { 2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2834 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2836 $self->send_packet ("drawinfo $color $msg")
2488 } 2837 }
2489 } 2838 }
2490 } 2839 }
2491} 2840}
2492 2841
2493=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2494 2843
2495Sends an ext event to the client. 2844Sends an ext event to the client.
2496 2845
2497=cut 2846=cut
2498 2847
2499sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2501 2850
2502 return unless $self->extcmd; 2851 if ($self->extcmd == 2) {
2503 2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 }
2857}
2858
2859=item $client->ext_reply ($msgid, @msg)
2860
2861Sends an ext reply to the client.
2862
2863=cut
2864
2865sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_;
2867
2868 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 }
2506} 2875}
2507 2876
2508=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2509 2878
2510Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2934 my ($ns, $buf) = @_;
2566 2935
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2936 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2937
2569 if (ref $msg) { 2938 if (ref $msg) {
2939 my ($type, $reply, @payload) =
2940 "ARRAY" eq ref $msg
2941 ? @$msg
2942 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2943
2944 my @reply;
2945
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2946 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2947 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2576 } else { 2953 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2955 }
2579 2956
2580 cf::override; 2957 cf::override;
2627our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2629 3006
2630$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2631 3008
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3009$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math
3011 grepstart grepwhile mapstart mapwhile
3012 sort time
3013));
2633 3014
2634# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2635 3016
2636=pod 3017=pod
2637 3018
2638The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2639 3020
2640 cf::object 3021 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 3023 insert remove name archname title slaying race decrease_ob_nr
2643 3024
2644 cf::object::player 3025 cf::object::player
2645 player 3026 player
2646 3027
2647 cf::player 3028 cf::player
2652 3033
2653=cut 3034=cut
2654 3035
2655for ( 3036for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race
2657 insert remove)], 3039 decrease_ob_nr destroy)],
2658 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2661) { 3043) {
2662 no strict 'refs'; 3044 no strict 'refs';
2738# the server's init and main functions 3120# the server's init and main functions
2739 3121
2740sub load_facedata($) { 3122sub load_facedata($) {
2741 my ($path) = @_; 3123 my ($path) = @_;
2742 3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3130
2743 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2744 3132
2745 my $facedata; 3133 my $facedata;
2746 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3135 or die "$path: $!";
2748 3136
2749 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2750 3138
2751 $facedata->{version} == 2 3139 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141
3142 # patch in the exptable
3143 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3146 };
3147 cf::cede_to_tick;
2753 3148
2754 { 3149 {
2755 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2756 3151
2757 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 3154 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3155 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3158
2764 cf::cede_to_tick; 3159 cf::cede_to_tick;
2765 } 3160 }
2766 3161
2767 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2792 3187
2793 { 3188 {
2794 # TODO: for gcfclient pleasure, we should give resources 3189 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3190 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3191 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3192
3193 my $soundconf = delete $res->{"res/sound.conf"};
2798 3194
2799 while (my ($name, $info) = each %$res) { 3195 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
2807 3198
2808 if ($name =~ /\.jpg$/) { 3199 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3200 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3208 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3209 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3210 }
2818 3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
2819 cf::cede_to_tick; 3215 cf::cede_to_tick;
2820 } 3216 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
2821 } 3235 }
2822 3236
2823 1 3237 1
2824} 3238}
2825 3239
3240register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_;
3242
3243 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v);
3245 }
3246};
3247
2826sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2827 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
2829 3255
2830 for (cf::region::list) { 3256 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3257 $_->{match} = qr/$_->{match}/
2867 3293
2868sub init { 3294sub init {
2869 reload_resources; 3295 reload_resources;
2870} 3296}
2871 3297
2872sub cfg_load { 3298sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3300 or return;
2875 3301
2876 local $/; 3302 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
2893sub main { 3319sub main {
2894 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3323 (async {
2898 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2900 }; 3327 };
2901 3328
2902 cfg_load; 3329 reload_config;
2903 db_init; 3330 db_init;
2904 load_extensions; 3331 load_extensions;
2905 3332
2906 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2907 Event::loop; 3335 EV::loop;
2908} 3336}
2909 3337
2910############################################################################# 3338#############################################################################
2911# initialisation and cleanup 3339# initialisation and cleanup
2912 3340
2913# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2914BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2923 },
2924 ); 3347 };
2925 } 3348 }
2926} 3349}
2927 3350
2928sub write_runtime { 3351sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
2974 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3403 $pl->save;
2980 } 3404 }
2981 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2982 3406
2983 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3022 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3448
3025 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3026 3450
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3033 for (;;) { 3452 for (;;) {
3034 BDB::flush; 3453 BDB::flush;
3035 IO::AIO::flush; 3454 IO::AIO::flush;
3036 Coro::cede; 3455 Coro::cede_notself;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3038 warn "iterate..."; 3457 warn "iterate...";
3039 } 3458 }
3040 3459
3041 ++$RELOAD; 3460 ++$RELOAD;
3100 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
3101 require cf; 3520 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3522
3104 warn "loading config and database again"; 3523 warn "loading config and database again";
3105 cf::cfg_load; 3524 cf::reload_config;
3106 3525
3107 warn "loading extensions"; 3526 warn "loading extensions";
3108 cf::load_extensions; 3527 cf::load_extensions;
3109 3528
3110 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
3130 3549
3131sub reload_perl() { 3550sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3134 3553
3135 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3142 }, 3556 do_reload_perl;
3143 ); 3557 };
3144} 3558}
3145 3559
3146register_command "reload" => sub { 3560register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3148 3562
3149 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3567 reload_perl;
3568 };
3152 } 3569 }
3153}; 3570};
3154 3571
3155unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3156 3573
3175 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3594 $signal->wait;
3178} 3595}
3179 3596
3180 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3191 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3192 return; 3601 return;
3193 } 3602 }
3194 3603
3195 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3196 3605
3197 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3198 3607
3199 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3200 for(1..10) { 3609 $NEXT_TICK += $TICK;
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204 3610
3205 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3206 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
3207 $map->alloc; 3613 Coro::async_pool {
3208 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3209 my $t = Event::time - $t; 3615 write_runtime
3210 3616 or warn "ERROR: unable to write runtime file: $!";
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3617 };
3618 }
3221 3619
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3621 $sig->send;
3238 } 3622 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3624 $sig->send;
3241 } 3625 }
3242 3626
3243 $NOW = Event::time;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3629
3254 _post_tick; 3630 _post_tick;
3255 3631};
3256 3632$TICK_WATCHER->priority (EV::MAXPRI);
3257 },
3258);
3259 3633
3260{ 3634{
3261 BDB::max_poll_time $TICK * 0.1;
3262 $BDB_POLL_WATCHER = Event->io (
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3635 BDB::min_parallel 8;
3271 3636 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare {
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3637
3287 unless ($DB_ENV) { 3638 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3639 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3641 | BDB::LOG_AUTOREMOVE, 1);
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3644
3290 cf::sync_job { 3645 cf::sync_job {
3291 eval { 3646 eval {
3292 BDB::db_env_open 3647 BDB::db_env_open
3293 $DB_ENV, 3648 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3650 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3651 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3652 0666;
3298 3653
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3654 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3655 };
3304 3656
3305 cf::cleanup "db_env_open(db): $@" if $@; 3657 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3658 };
3307 } 3659 }
3660
3661 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 };
3664 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3665 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3666 };
3667 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 };
3308} 3670}
3309 3671
3310{ 3672{
3311 IO::AIO::min_parallel 8; 3673 IO::AIO::min_parallel 8;
3312 3674
3313 undef $Coro::AIO::WATCHER; 3675 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3676 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3678}
3324 3679
3325my $_log_backtrace; 3680my $_log_backtrace;
3326 3681
3327sub _log_backtrace { 3682sub _log_backtrace {
3331 3686
3332 # limit the # of concurrent backtraces 3687 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3688 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3689 ++$_log_backtrace;
3335 async { 3690 async {
3691 $Coro::current->{desc} = "abt $msg";
3692
3336 my @bt = fork_call { 3693 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3694 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3695 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3696 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3697 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines