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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines