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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.402 by root, Mon Dec 17 07:03:32 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
327=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
328 356
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
340our @SLOT_QUEUE; 368our @SLOT_QUEUE;
341our $SLOT_QUEUE; 369our $SLOT_QUEUE;
342 370
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
345 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
346 376
347 while () { 377 while () {
348 next_job: 378 next_job:
349 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
357 } 387 }
358 } 388 }
359 } 389 }
360 390
361 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 394 $signal->wait;
365 } else { 395 } else {
366 Coro::schedule; 396 Coro::schedule;
367 } 397 }
390 420
391BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
392 422
393=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
394 424
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
397partly 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
398acceptable. 428acceptable.
399 429
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
406 436
407sub sync_job(&) { 437sub sync_job(&) {
408 my ($job) = @_; 438 my ($job) = @_;
409 439
410 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 441 my $time = EV::time;
412 442
413 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
415 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
416 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 449 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
419 451
420 my $busy = 1; 452 my $busy = 1;
421 my @res; 453 my @res;
422 454
423 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 457 @res = eval { $job->() };
425 warn $@ if $@; 458 warn $@ if $@;
426 undef $busy; 459 undef $busy;
427 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
428 461
429 while ($busy) { 462 while ($busy) {
430 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
431 } 467 }
468 }
432 469
433 $time = Event::time - $time; 470 $time = EV::time - $time;
434 471
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 474
438 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
468=item fork_call { }, $args 505=item fork_call { }, $args
469 506
470Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
474 511
475=cut 512=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 513
486sub fork_call(&@) { 514sub fork_call(&@) {
487 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
488 516
489# 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,
490# or die "socketpair: $!"; 518 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 519 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 520
494 if (my $pid = fork) { 521 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 522 reset_signals;
508 local $SIG{__WARN__}; 523 &$cb
509 local $SIG{__DIE__}; 524 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 525
516 eval { 526 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 527}
529 528
530=item $value = cf::db_get $family => $key 529=item $value = cf::db_get $family => $key
531 530
532Returns a single value from the environment database. 531Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
535 534
536Stores 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
537data 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).
538 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
539=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}
540 561
541our $DB; 562our $DB;
542 563
543sub db_init { 564sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 565 cf::sync_job {
548 eval { 566 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 567 };
558} 568}
559 569
560sub db_get($$) { 570sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
562 572
612 if (1) { 622 if (1) {
613 $md5 = 623 $md5 =
614 join "\x00", 624 join "\x00",
615 $processversion, 625 $processversion,
616 map { 626 map {
617 Coro::cede; 627 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 629 } 0.. $#$src;
620 630
621 631
622 my $dbmd5 = db_get cache => "$id/md5"; 632 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
668 678
669In 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>
670C<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
671Crossfire TRT). 681Deliantra).
672 682
673=over 4 683=over 4
674 684
675=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
676 686
974 984
975=cut 985=cut
976 986
977############################################################################# 987#############################################################################
978# object support 988# object support
979#
980 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#
981sub _can_merge { 1023sub _can_merge {
982 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
983 1025
984 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1027
988 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
989} 1030}
990 1031
991sub reattach { 1032sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1034 my ($obj) = @_;
1015cf::attachable->attach ( 1056cf::attachable->attach (
1016 prio => -1000000, 1057 prio => -1000000,
1017 on_instantiate => sub { 1058 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
1019 1060
1020 $data = from_json $data; 1061 $data = decode_json $data;
1021 1062
1022 for (@$data) { 1063 for (@$data) {
1023 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
1024 1065
1025 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1082sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1043 1084
1044 sync_job { 1085 sync_job {
1045 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1048 1090
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1095 close $fh;
1054 1096
1055 if (@$objs) { 1097 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1103 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1105 }
1071 } 1113 }
1072 } else { 1114 } else {
1073 aio_unlink $filename; 1115 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1075 } 1117 }
1076 } 1118 };
1077} 1119}
1078 1120
1079sub object_freezer_as_string { 1121sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1081 1123
1093 or return; 1135 or return;
1094 1136
1095 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1139 or return;
1140
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1099 } 1143 }
1100 1144
1145 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1103 return ($data, $av); 1149 ($data, $av)
1104} 1150}
1105 1151
1106=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1107 1153
1108=over 4 1154=over 4
1181 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
1182 1228
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1230
1185 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
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
1191 } else { 1246 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1248 }
1194 1249
1195 cf::override; 1250 cf::override;
1285 1340
1286=head3 cf::player 1341=head3 cf::player
1287 1342
1288=over 4 1343=over 4
1289 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
1290=item cf::player::find $login 1359=item cf::player::find $login
1291 1360
1292Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1293 1362
1294=cut 1363=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1402
1334 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1337 } 1411 }
1338 } 1412 }
1339} 1413}
1340 1414
1350 1424
1351 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1353 1427
1354 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1355 Coro::cede; 1429 cf::cede_to_tick;
1356} 1430}
1357 1431
1358sub new($) { 1432sub new($) {
1359 my ($login) = @_; 1433 my ($login) = @_;
1360 1434
1364 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1365 1439
1366 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1367 1441
1368 $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 (@_);
1369} 1453}
1370 1454
1371=item $pl->quit_character 1455=item $pl->quit_character
1372 1456
1373Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1512 or return [];
1429 1513
1430 my @logins; 1514 my @logins;
1431 1515
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1436 1525
1437 utf8::decode $login; 1526 utf8::decode $login;
1438 push @logins, $login; 1527 push @logins, $login;
1439 } 1528 }
1440 1529
1473 1562
1474Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1475 1564
1476=cut 1565=cut
1477 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
1478sub expand_cfpod { 1578sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1480 1580
1481 # escape & and < 1581 my $xml;
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484 1582
1485 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1486 1586
1487 1 while 1587 $group =~ s/&/&amp;/g;
1488 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1492 # replace G<male|female> tags 1592 ([BCGHITU])
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1593 <
1494 $self->gender ? $2 : $1 1594 (?:
1495 }ge 1595 ([^<>]*) (?{ $group = $^N })
1496 # replace H<hint text> 1596 | < $interior >
1497 || s{H<([^\>]*)>} 1597 )
1598 >
1599 %gcsx
1498 { 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") {
1499 ("<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>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "") 1620 "")
1502 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1503 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1504 1632
1633 for ($xml) {
1505 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1507 1636
1508 # compress some whitespace 1637 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1513 1643
1514 $_ 1644 $xml
1515} 1645}
1646
1647no re 'eval';
1516 1648
1517sub hintmode { 1649sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1651 $_[0]{hintmode}
1520} 1652}
1521 1653
1522=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1523 1655
1524Sends an ext reply to the player. 1656Sends an ext reply to the player.
1525 1657
1526=cut 1658=cut
1527 1659
1528sub ext_reply($$%) { 1660sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1530 1662
1531 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1664}
1534 1665
1535=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1536 1667
1537Sends an ext event to the client. 1668Sends an ext event to the client.
1538 1669
1539=cut 1670=cut
1540 1671
1541sub ext_event($$%) { 1672sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1543 1674
1544 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1545} 1676}
1546 1677
1547=head3 cf::region 1678=head3 cf::region
1548 1679
1549=over 4 1680=over 4
1765 1896
1766sub load_header_from($) { 1897sub load_header_from($) {
1767 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1768 1899
1769 utf8::encode $path; 1900 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 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;
1775 1909
1776 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1777 1911
1778 1 1912 1
1779} 1913}
1833sub find { 1967sub find {
1834 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1835 1969
1836 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1837 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1839 1974
1840 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1841 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
1842 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1843 or return; 1980 or return;
1844 1981
1845 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1846 1983
1848 or return; 1985 or return;
1849 1986
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1853 $map->reset; 1992 $map->reset;
1854 undef $guard;
1855 return find $path; 1993 return find $path;
1856 } 1994 }
1857 1995
1858 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1859 } 1997 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1869 2007
1870 my $path = $self->{path}; 2008 my $path = $self->{path};
1871 2009
1872 { 2010 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1874 2012
2013 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2015
1877 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1878 2017
1879 $self->alloc; 2018 $self->alloc;
1880 2019
1881 $self->pre_load; 2020 $self->pre_load;
1882 Coro::cede; 2021 cf::cede_to_tick;
1883 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1885 or return; 2026 or return;
1886 2027
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1889 2030
1890 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2032 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2035 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1895 } 2039 }
1896 } 2040 }
1897 2041
1898 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1899 # now do the right thing for maps 2045 # now do the right thing for maps
1900 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2048 unless $self->difficulty;
1903 Coro::cede; 2049 cf::cede_to_tick;
1904 2050
1905 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2052 $self->decay_objects;
1907 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1908 $self->update_buttons; 2054 $self->update_buttons;
1909 Coro::cede; 2055 cf::cede_to_tick;
1910 $self->set_darkness_map; 2056 $self->set_darkness_map;
1911 Coro::cede; 2057 cf::cede_to_tick;
1912 $self->activate; 2058 $self->activate;
1913 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1914 2063
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2065 }
1917 2066
1918 $self->post_load; 2067 $self->post_load;
1929 2078
1930 $self 2079 $self
1931} 2080}
1932 2081
1933# 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
1934sub load_diag { 2083sub load_neighbours {
1935 my ($map) = @_; 2084 my ($map) = @_;
1936 2085
1937 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1938 2087
1939 for (0 .. 3) { 2088 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1941 or next; 2090 or next;
1942 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1943 or next; 2092 or next;
1944 $neigh->load; 2093 $neigh->load;
1945 2094
2095 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2098 }
1949 2099
1950 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1952 or next; 2103 or next;
1953 $neigh->load; 2104 $neigh->load;
1954 } 2105 }
1955} 2106}
1956 2107
1961} 2112}
1962 2113
1963sub do_load_sync { 2114sub do_load_sync {
1964 my ($map) = @_; 2115 my ($map) = @_;
1965 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1966 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1967} 2121}
1968 2122
1969our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1971 2125
1972sub find_async { 2126sub find_async {
1973 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1974 2128
1975 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1976 2130
1977 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2133 }
1980 2134
1981 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1982 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1983 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2142 if (my $map = find $k) {
1986 $map->load; 2143 $map->load if $v;
1987 } 2144 }
1988 2145
1989 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1990 } 2147 }
1991 } 2148 }
1992 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1993 }; 2150 };
1994 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
1997} 2154}
1998 2155
1999sub save { 2156sub save {
2000 my ($self) = @_; 2157 my ($self) = @_;
2001 2158
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2160
2004 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
2005 2162
2006 return unless $self->dirty; 2163 return unless $self->dirty;
2007 2164
2013 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2014 2171
2015 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2016 2173
2017 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2019 }; 2177 };
2020 2178
2021 if ($uniq) { 2179 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2188 my ($self) = @_;
2031 2189
2032 # save first because save cedes 2190 # save first because save cedes
2033 $self->save; 2191 $self->save;
2034 2192
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2194
2037 return if $self->players; 2195 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2197 return if $self->{deny_save};
2040 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2203 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2204}
2044 2205
2045sub reset_at { 2206sub reset_at {
2046 my ($self) = @_; 2207 my ($self) = @_;
2047 2208
2079 if $uniq; 2240 if $uniq;
2080 } 2241 }
2081 2242
2082 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2083 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2247 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2248
2088 $self->unlink_save; 2249 $self->unlink_save;
2089 $self->destroy; 2250 $self->destroy;
2090} 2251}
2091 2252
2092my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
2093 2254
2094sub nuke { 2255sub nuke {
2095 my ($self) = @_; 2256 my ($self) = @_;
2096 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2097 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
2098 2262
2099 $self->unlink_save; 2263 $self->unlink_save;
2100 2264
2101 bless $self, "cf::map"; 2265 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2270
2107 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
2108 2273
2109 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2110} 2275}
2111 2276
2112=item $maps = cf::map::tmp_maps 2277=item $maps = cf::map::tmp_maps
2188 2353
2189sub inv_recursive { 2354sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2191} 2356}
2192 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
2193package cf; 2386package cf;
2194 2387
2195=back 2388=back
2196 2389
2197=head3 cf::object::player 2390=head3 cf::object::player
2219 2412
2220 } else { 2413 } else {
2221 my $pl = $self->contr; 2414 my $pl = $self->contr;
2222 2415
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2419
2232 } else { 2420 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2235 } 2423 }
2236 } 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 (@_);
2237} 2435}
2238 2436
2239=item $player_object->may ("access") 2437=item $player_object->may ("access")
2240 2438
2241Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
2323 2521
2324 $map->load; 2522 $map->load;
2325 $map->load_diag; 2523 $map->load_neighbours;
2326 2524
2327 return unless $self->contr->active; 2525 return unless $self->contr->active;
2328 $self->activate_recursive; 2526 $self->activate_recursive;
2329 2527
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2549
2352 $self->enter_link; 2550 $self->enter_link;
2353 2551
2354 (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
2355 my $map = eval { 2574 my $map = eval {
2356 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2357 2576
2358 if ($map) { 2577 if ($map) {
2359 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2361 } else { 2580 } else {
2362 $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);
2363 } 2582 }
2364 2583
2365 $map 2584 $map
2366 }; 2585 };
2367 2586
2420 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2421 } 2640 }
2422 2641
2423 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2424 2643
2425 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2426 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2428 2647
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2457 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2460 2679
2461 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2462 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2684 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2465 2686
2466 1; 2687 1;
2501the 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
2502the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2503 2724
2504=cut 2725=cut
2505 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
2506sub cf::client::send_msg { 2779sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2781
2509 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2510 2783
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 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
2513 if (ref $channel) { 2795 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2518 } 2801 }
2519 2802
2520 $channel = $channel->{id}; 2803 $channel = $channel->{id};
2521 } 2804 }
2522 2805
2523 return unless @extra || length $msg; 2806 return unless @extra || length $msg;
2524 2807
2525 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
2526 $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]));
2527 } else { 2815 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 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
2539 if (0 && $msg =~ /\[/) { 2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2834 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2836 $self->send_packet ("drawinfo $color $msg")
2544 } 2837 }
2545 } 2838 }
2546 } 2839 }
2547} 2840}
2548 2841
2549=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2550 2843
2551Sends an ext event to the client. 2844Sends an ext event to the client.
2552 2845
2553=cut 2846=cut
2554 2847
2555sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2557 2850
2558 return unless $self->extcmd; 2851 if ($self->extcmd == 2) {
2559 2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2561 $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 }
2562} 2875}
2563 2876
2564=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2565 2878
2566Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2934 my ($ns, $buf) = @_;
2622 2935
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2936 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2937
2625 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
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2946 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2947 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2632 } else { 2953 } else {
2633 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";
2634 } 2955 }
2635 2956
2636 cf::override; 2957 cf::override;
2683our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2685 3006
2686$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2687 3008
2688$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));
2689 3014
2690# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2691 3016
2692=pod 3017=pod
2693 3018
2694The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2695 3020
2696 cf::object 3021 cf::object
2697 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
2698 insert remove 3023 insert remove name archname title slaying race decrease_ob_nr
2699 3024
2700 cf::object::player 3025 cf::object::player
2701 player 3026 player
2702 3027
2703 cf::player 3028 cf::player
2708 3033
2709=cut 3034=cut
2710 3035
2711for ( 3036for (
2712 ["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
2713 insert remove)], 3039 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2717) { 3043) {
2718 no strict 'refs'; 3044 no strict 'refs';
2794# the server's init and main functions 3120# the server's init and main functions
2795 3121
2796sub load_facedata($) { 3122sub load_facedata($) {
2797 my ($path) = @_; 3123 my ($path) = @_;
2798 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
2799 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2800 3132
2801 my $facedata; 3133 my $facedata;
2802 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3135 or die "$path: $!";
2804 3136
2805 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2806 3138
2807 $facedata->{version} == 2 3139 $facedata->{version} == 2
2808 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;
2809 3148
2810 { 3149 {
2811 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2812 3151
2813 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3154 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3155 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3158
2820 cf::cede_to_tick; 3159 cf::cede_to_tick;
2821 } 3160 }
2822 3161
2823 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2848 3187
2849 { 3188 {
2850 # TODO: for gcfclient pleasure, we should give resources 3189 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3190 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3191 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3192
3193 my $soundconf = delete $res->{"res/sound.conf"};
2854 3194
2855 while (my ($name, $info) = each %$res) { 3195 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
2863 3198
2864 if ($name =~ /\.jpg$/) { 3199 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3200 # prepend meta info
2866 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};
2867 } else { 3208 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3209 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3210 }
2874 3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
2875 cf::cede_to_tick; 3215 cf::cede_to_tick;
2876 } 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 }
2877 } 3235 }
2878 3236
2879 1 3237 1
2880} 3238}
2881 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
2882sub 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
2883 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
2885 3255
2886 for (cf::region::list) { 3256 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3257 $_->{match} = qr/$_->{match}/
2923 3293
2924sub init { 3294sub init {
2925 reload_resources; 3295 reload_resources;
2926} 3296}
2927 3297
2928sub cfg_load { 3298sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3300 or return;
2931 3301
2932 local $/; 3302 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3319sub main {
2950 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2952 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#
2953 (async { 3323 (async {
2954 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2956 }; 3327 };
2957 3328
2958 cfg_load; 3329 reload_config;
2959 db_init; 3330 db_init;
2960 load_extensions; 3331 load_extensions;
2961 3332
2962 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2963 Event::loop; 3335 EV::loop;
2964} 3336}
2965 3337
2966############################################################################# 3338#############################################################################
2967# initialisation and cleanup 3339# initialisation and cleanup
2968 3340
2969# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2970BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2979 },
2980 ); 3347 };
2981 } 3348 }
2982} 3349}
2983 3350
2984sub write_runtime { 3351sub write_runtime {
2985 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3030 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3403 $pl->save;
3036 } 3404 }
3037 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3038 3406
3039 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3078 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3448
3081 # 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
3082 3450
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3089 for (;;) { 3452 for (;;) {
3090 BDB::flush; 3453 BDB::flush;
3091 IO::AIO::flush; 3454 IO::AIO::flush;
3092 Coro::cede; 3455 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3457 warn "iterate...";
3095 } 3458 }
3096 3459
3097 ++$RELOAD; 3460 ++$RELOAD;
3156 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
3157 require cf; 3520 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3522
3160 warn "loading config and database again"; 3523 warn "loading config and database again";
3161 cf::cfg_load; 3524 cf::reload_config;
3162 3525
3163 warn "loading extensions"; 3526 warn "loading extensions";
3164 cf::load_extensions; 3527 cf::load_extensions;
3165 3528
3166 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
3186 3549
3187sub reload_perl() { 3550sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3190 3553
3191 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3198 }, 3556 do_reload_perl;
3199 ); 3557 };
3200} 3558}
3201 3559
3202register_command "reload" => sub { 3560register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3204 3562
3205 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3567 reload_perl;
3568 };
3208 } 3569 }
3209}; 3570};
3210 3571
3211unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3212 3573
3231 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3594 $signal->wait;
3234} 3595}
3235 3596
3236 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3246 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"
3247 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3248 return; 3601 return;
3249 } 3602 }
3250 3603
3251 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3252 3605
3253 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3254 3607
3255 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3256 for(1..10) { 3609 $NEXT_TICK += $TICK;
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260 3610
3261 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3262 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3263 $map->alloc; 3613 Coro::async_pool {
3264 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3265 my $t = Event::time - $t; 3615 write_runtime
3266 3616 or warn "ERROR: unable to write runtime file: $!";
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3617 };
3618 }
3277 3619
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3621 $sig->send;
3294 } 3622 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3624 $sig->send;
3297 } 3625 }
3298 3626
3299 $NOW = Event::time;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3629
3310 _post_tick; 3630 _post_tick;
3311 3631};
3312 3632$TICK_WATCHER->priority (EV::MAXPRI);
3313 },
3314);
3315 3633
3316{ 3634{
3317 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3636
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3327 3638 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare {
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3639
3343 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1);
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3646
3346 cf::sync_job { 3647 cf::sync_job {
3347 eval { 3648 eval {
3348 BDB::db_env_open 3649 BDB::db_env_open
3349 $DB_ENV, 3650 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3652 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3653 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3654 0666;
3354 3655
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3656 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3657 };
3360 3658
3361 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3660 };
3363 } 3661 }
3662
3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3665 };
3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3668 };
3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3671 };
3364} 3672}
3365 3673
3366{ 3674{
3675 # configure IO::AIO
3676
3367 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io (
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3679}
3380 3680
3381my $_log_backtrace; 3681my $_log_backtrace;
3382 3682
3383sub _log_backtrace { 3683sub _log_backtrace {
3387 3687
3388 # limit the # of concurrent backtraces 3688 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3689 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3690 ++$_log_backtrace;
3391 async { 3691 async {
3692 $Coro::current->{desc} = "abt $msg";
3693
3392 my @bt = fork_call { 3694 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3695 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3696 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3697 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3698 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines