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.318 by root, Tue Jul 24 04:55:34 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 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 1.86;
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 ();
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
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 43
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 45
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 47
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
74 72
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 74our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 77our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
82 79
83our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 84our $DB_ENV;
85 85
86our %CFG; 86our %CFG;
87 87
88our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 89our $RUNTIME;
90our $NOW;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
158 159
159The raw value load value from the last tick. 160The raw value load value from the last tick.
160 161
161=item %cf::CFG 162=item %cf::CFG
162 163
163Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 165from wherever your confdir points to.
165 166
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
195 200
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 217)) {
213 no strict 'refs'; 218 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 220}
216 221
217$Event::DIED = sub { 222$EV::DIED = sub {
218 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
219}; 224};
220 225
221############################################################################# 226#############################################################################
222 227
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 251 $d
247 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
248} 253}
249 254
250=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
251 256
252Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
253 258
254=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
255 260
256Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
257 262
258=cut 263=cut
259 264
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 266
262sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
264 269
265=item cf::lock_wait $string 270=item cf::lock_wait $string
266 271
267Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
268 273
271Wait until the given lock is available and then acquires it and returns 276Wait 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, 277a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
274returned. 279returned.
275 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
276Lock names should begin with a unique identifier (for example, cf::map::find 284Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
278 286
279=item $locked = cf::lock_active $string 287=item $locked = cf::lock_active $string
280 288
281Return true if the lock is currently active, i.e. somebody has locked it. 289Return true if the lock is currently active, i.e. somebody has locked it.
282 290
283=cut 291=cut
284 292
285our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
286 295
287sub lock_wait($) { 296sub lock_wait($) {
288 my ($key) = @_; 297 my ($key) = @_;
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
289 303
290 # wait for lock, if any 304 # wait for lock, if any
291 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 307 Coro::schedule;
299 313
300 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
301 lock_wait $key; 315 lock_wait $key;
302 316
303 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
304 319
305 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
308 } 324 }
309} 325}
310 326
322 }; 338 };
323 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
324 $guard 340 $guard
325} 341}
326 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
327=item cf::get_slot $time[, $priority[, $name]] 358=item cf::get_slot $time[, $priority[, $name]]
328 359
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 360Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 361This 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. 362of cpu time till the next tick. The slot is only valid till the next cede.
340our @SLOT_QUEUE; 371our @SLOT_QUEUE;
341our $SLOT_QUEUE; 372our $SLOT_QUEUE;
342 373
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
345 my $signal = new Coro::Signal; 378 my $signal = new Coro::Signal;
346 379
347 while () { 380 while () {
348 next_job: 381 next_job:
349 my $avail = cf::till_tick; 382 my $avail = cf::till_tick;
357 } 390 }
358 } 391 }
359 } 392 }
360 393
361 if (@SLOT_QUEUE) { 394 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 396 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 397 $signal->wait;
365 } else { 398 } else {
366 Coro::schedule; 399 Coro::schedule;
367 } 400 }
390 423
391BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
392 425
393=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
394 427
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 429is 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 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 431acceptable.
399 432
400If it must be done, put the blocking parts into C<sync_job>. This will run 433If 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 434the given BLOCK in another coroutine while waiting for the result. The
406 439
407sub sync_job(&) { 440sub sync_job(&) {
408 my ($job) = @_; 441 my ($job) = @_;
409 442
410 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 444 my $time = EV::time;
412 445
413 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
415 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
416 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 452 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
419 454
420 my $busy = 1; 455 my $busy = 1;
421 my @res; 456 my @res;
422 457
423 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 460 @res = eval { $job->() };
425 warn $@ if $@; 461 warn $@ if $@;
426 undef $busy; 462 undef $busy;
427 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
428 464
429 while ($busy) { 465 while ($busy) {
430 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
431 } 470 }
471 }
432 472
433 $time = Event::time - $time; 473 $time = EV::time - $time;
434 474
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 477
438 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
468=item fork_call { }, $args 508=item fork_call { }, $args
469 509
470Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
474 514
475=cut 515=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 516
486sub fork_call(&@) { 517sub fork_call(&@) {
487 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
488 519
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 520 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 521 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 522 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 523
494 if (my $pid = fork) { 524 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; 525 reset_signals;
508 local $SIG{__WARN__}; 526 &$cb
509 local $SIG{__DIE__}; 527 }, @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 528
516 eval { 529 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} 530}
529 531
530=item $value = cf::db_get $family => $key 532=item $value = cf::db_get $family => $key
531 533
532Returns a single value from the environment database. 534Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 536=item cf::db_put $family => $key => $value
535 537
536Stores the given C<$value> in the family. It can currently store binary 538Stores 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). 539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 540
541=item $db = cf::db_table "name"
542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
539=cut 546=cut
547
548sub db_table($) {
549 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV;
551
552 eval {
553 $db->set_flags (BDB::CHKSUM);
554
555 utf8::encode $name;
556 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
557 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
558 cf::cleanup "db_open(db): $!" if $!;
559 };
560 cf::cleanup "db_open(db): $@" if $@;
561
562 $db
563}
540 564
541our $DB; 565our $DB;
542 566
543sub db_init { 567sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 568 cf::sync_job {
548 eval { 569 $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 } 570 };
558} 571}
559 572
560sub db_get($$) { 573sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 574 my $key = "$_[0]/$_[1]";
562 575
612 if (1) { 625 if (1) {
613 $md5 = 626 $md5 =
614 join "\x00", 627 join "\x00",
615 $processversion, 628 $processversion,
616 map { 629 map {
617 Coro::cede; 630 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 632 } 0.. $#$src;
620 633
621 634
622 my $dbmd5 = db_get cache => "$id/md5"; 635 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
668 681
669In the following description, CLASS can be any of C<global>, C<object> 682In 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 683C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 684Deliantra).
672 685
673=over 4 686=over 4
674 687
675=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
676 689
958 } 971 }
959 972
960 0 973 0
961} 974}
962 975
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 977
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 979
967Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
968 981
974 987
975=cut 988=cut
976 989
977############################################################################# 990#############################################################################
978# object support 991# object support
979#
980 992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
981sub _can_merge { 1026sub _can_merge {
982 my ($ob1, $ob2) = @_; 1027 my ($ob1, $ob2) = @_;
983 1028
984 local $Storable::canonical = 1; 1029 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1030
988 $fob1 eq $fob2 1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
989} 1033}
990 1034
991sub reattach { 1035sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1037 my ($obj) = @_;
1015cf::attachable->attach ( 1059cf::attachable->attach (
1016 prio => -1000000, 1060 prio => -1000000,
1017 on_instantiate => sub { 1061 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
1019 1063
1020 $data = from_json $data; 1064 $data = decode_json $data;
1021 1065
1022 for (@$data) { 1066 for (@$data) {
1023 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
1024 1068
1025 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1085sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
1043 1087
1044 sync_job { 1088 sync_job {
1045 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
1048 1093
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1098 close $fh;
1054 1099
1055 if (@$objs) { 1100 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1106 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1108 }
1071 } 1116 }
1072 } else { 1117 } else {
1073 aio_unlink $filename; 1118 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
1075 } 1120 }
1076 } 1121 };
1077} 1122}
1078 1123
1079sub object_freezer_as_string { 1124sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
1081 1126
1093 or return; 1138 or return;
1094 1139
1095 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1142 or return;
1143
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1099 } 1146 }
1100 1147
1148 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
1103 return ($data, $av); 1152 ($data, $av)
1104} 1153}
1105 1154
1106=head2 COMMAND CALLBACKS 1155=head2 COMMAND CALLBACKS
1107 1156
1108=over 4 1157=over 4
1186 my ($type, $reply, @payload) = 1235 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1236 "ARRAY" eq ref $msg
1188 ? @$msg 1237 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1239
1240 my @reply;
1241
1191 if (my $cb = $EXTCMD{$type}) { 1242 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1243 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
1197 } else { 1249 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1251 }
1200 1252
1201 cf::override; 1253 cf::override;
1291 1343
1292=head3 cf::player 1344=head3 cf::player
1293 1345
1294=over 4 1346=over 4
1295 1347
1348=item cf::player::num_playing
1349
1350Returns the official number of playing players, as per the Crossfire metaserver rules.
1351
1352=cut
1353
1354sub num_playing {
1355 scalar grep
1356 $_->ob->map
1357 && !$_->hidden
1358 && !$_->ob->flag (cf::FLAG_WIZ),
1359 cf::player::list
1360}
1361
1296=item cf::player::find $login 1362=item cf::player::find $login
1297 1363
1298Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1299 1365
1300=cut 1366=cut
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1405
1340 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1407 or return;
1408
1409 my $pl = cf::player::load_pl $f
1410 or return;
1411 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1343 } 1414 }
1344 } 1415 }
1345} 1416}
1346 1417
1356 1427
1357 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1359 1430
1360 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1361 Coro::cede; 1432 cf::cede_to_tick;
1362} 1433}
1363 1434
1364sub new($) { 1435sub new($) {
1365 my ($login) = @_; 1436 my ($login) = @_;
1366 1437
1370 $self->{deny_save} = 1; 1441 $self->{deny_save} = 1;
1371 1442
1372 $cf::PLAYER{$login} = $self; 1443 $cf::PLAYER{$login} = $self;
1373 1444
1374 $self 1445 $self
1446}
1447
1448=item $player->send_msg ($channel, $msg, $color, [extra...])
1449
1450=cut
1451
1452sub send_msg {
1453 my $ns = shift->ns
1454 or return;
1455 $ns->send_msg (@_);
1375} 1456}
1376 1457
1377=item $pl->quit_character 1458=item $pl->quit_character
1378 1459
1379Nukes the player without looking back. If logged in, the connection will 1460Nukes the player without looking back. If logged in, the connection will
1434 or return []; 1515 or return [];
1435 1516
1436 my @logins; 1517 my @logins;
1437 1518
1438 for my $login (@$dirs) { 1519 for my $login (@$dirs) {
1520 my $path = path $login;
1521
1522 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1442 1528
1443 utf8::decode $login; 1529 utf8::decode $login;
1444 push @logins, $login; 1530 push @logins, $login;
1445 } 1531 }
1446 1532
1479 1565
1480Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1481 1567
1482=cut 1568=cut
1483 1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1484sub expand_cfpod { 1581sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1486 1583
1487 # escape & and < 1584 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1585
1491 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1492 1589
1493 1 while 1590 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1595 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1596 <
1500 $self->gender ? $2 : $1 1597 (?:
1501 }ge 1598 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1599 | < $interior >
1503 || s{H<([^\>]*)>} 1600 )
1601 >
1602 %gcsx
1504 { 1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1623 "")
1508 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1510 1635
1636 for ($xml) {
1511 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1513 1639
1514 # compress some whitespace 1640 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1519 1646
1520 $_ 1647 $xml
1521} 1648}
1649
1650no re 'eval';
1522 1651
1523sub hintmode { 1652sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1654 $_[0]{hintmode}
1526} 1655}
1532=cut 1661=cut
1533 1662
1534sub ext_reply($$@) { 1663sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1664 my ($self, $id, @msg) = @_;
1536 1665
1537 if ($self->ns->extcmd == 2) { 1666 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1667}
1545 1668
1546=item $player->ext_msg ($type, @msg) 1669=item $player->ext_msg ($type, @msg)
1547 1670
1548Sends an ext event to the client. 1671Sends an ext event to the client.
1776 1899
1777sub load_header_from($) { 1900sub load_header_from($) {
1778 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1779 1902
1780 utf8::encode $path; 1903 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1786 1912
1787 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1788 1914
1789 1 1915 1
1790} 1916}
1844sub find { 1970sub find {
1845 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1846 1972
1847 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1848 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1850 1977
1851 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1853 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1854 or return; 1983 or return;
1855 1984
1856 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1857 1986
1859 or return; 1988 or return;
1860 1989
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1864 $map->reset; 1995 $map->reset;
1865 undef $guard;
1866 return find $path; 1996 return find $path;
1867 } 1997 }
1868 1998
1869 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1870 } 2000 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1880 2010
1881 my $path = $self->{path}; 2011 my $path = $self->{path};
1882 2012
1883 { 2013 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1885 2015
2016 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2018
1888 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1889 2020
1890 $self->alloc; 2021 $self->alloc;
1891 2022
1892 $self->pre_load; 2023 $self->pre_load;
1893 Coro::cede; 2024 cf::cede_to_tick;
1894 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1896 or return; 2029 or return;
1897 2030
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1900 2033
1901 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2035 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2038 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1906 } 2042 }
1907 } 2043 }
1908 2044
1909 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1910 # now do the right thing for maps 2048 # now do the right thing for maps
1911 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2051 unless $self->difficulty;
1914 Coro::cede; 2052 cf::cede_to_tick;
1915 2053
1916 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2055 $self->decay_objects;
1918 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1919 $self->update_buttons; 2057 $self->update_buttons;
1920 Coro::cede; 2058 cf::cede_to_tick;
1921 $self->set_darkness_map; 2059 $self->set_darkness_map;
1922 Coro::cede; 2060 cf::cede_to_tick;
1923 $self->activate; 2061 $self->activate;
1924 } 2062 }
2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
1925 2066
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 2068 }
1928 2069
1929 $self->post_load; 2070 $self->post_load;
1940 2081
1941 $self 2082 $self
1942} 2083}
1943 2084
1944# find and load all maps in the 3x3 area around a map 2085# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2086sub load_neighbours {
1946 my ($map) = @_; 2087 my ($map) = @_;
1947 2088
1948 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1949 2090
1950 for (0 .. 3) { 2091 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1952 or next; 2093 or next;
1953 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1954 or next; 2095 or next;
1955 $neigh->load; 2096 $neigh->load;
1956 2097
2098 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2101 }
1960 2102
1961 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1963 or next; 2106 or next;
1964 $neigh->load; 2107 $neigh->load;
1965 } 2108 }
1966} 2109}
1967 2110
1972} 2115}
1973 2116
1974sub do_load_sync { 2117sub do_load_sync {
1975 my ($map) = @_; 2118 my ($map) = @_;
1976 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1977 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1978} 2124}
1979 2125
1980our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1982 2128
1983sub find_async { 2129sub find_async {
1984 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1985 2131
1986 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1987 2133
1988 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2136 }
1991 2137
1992 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1993 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1994 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2145 if (my $map = find $k) {
1997 $map->load; 2146 $map->load if $v;
1998 } 2147 }
1999 2148
2000 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
2001 } 2150 }
2002 } 2151 }
2003 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
2004 }; 2153 };
2005 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
2008} 2157}
2009 2158
2010sub save { 2159sub save {
2011 my ($self) = @_; 2160 my ($self) = @_;
2012 2161
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2163
2015 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
2016 2165
2017 return unless $self->dirty; 2166 return unless $self->dirty;
2018 2167
2024 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2025 2174
2026 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2027 2176
2028 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2030 }; 2180 };
2031 2181
2032 if ($uniq) { 2182 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2041 my ($self) = @_; 2191 my ($self) = @_;
2042 2192
2043 # save first because save cedes 2193 # save first because save cedes
2044 $self->save; 2194 $self->save;
2045 2195
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2197
2048 return if $self->players; 2198 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2200 return if $self->{deny_save};
2051 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2206 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2207}
2055 2208
2056sub reset_at { 2209sub reset_at {
2057 my ($self) = @_; 2210 my ($self) = @_;
2058 2211
2090 if $uniq; 2243 if $uniq;
2091 } 2244 }
2092 2245
2093 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2094 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2250 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2251
2099 $self->unlink_save; 2252 $self->unlink_save;
2100 $self->destroy; 2253 $self->destroy;
2101} 2254}
2102 2255
2103my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
2104 2257
2105sub nuke { 2258sub nuke {
2106 my ($self) = @_; 2259 my ($self) = @_;
2107 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
2108 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
2109 2265
2110 $self->unlink_save; 2266 $self->unlink_save;
2111 2267
2112 bless $self, "cf::map"; 2268 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2273
2118 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
2119 2276
2120 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2121} 2278}
2122 2279
2123=item $maps = cf::map::tmp_maps 2280=item $maps = cf::map::tmp_maps
2199 2356
2200sub inv_recursive { 2357sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2202} 2359}
2203 2360
2361=item $ref = $ob->ref
2362
2363creates and returns a persistent reference to an objetc that can be stored as a string.
2364
2365=item $ob = cf::object::deref ($refstring)
2366
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block.
2369
2370=cut
2371
2372sub deref {
2373 my ($ref) = @_;
2374
2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2376 my ($uuid, $name) = ($1, $2);
2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2378 or return;
2379 $pl->ob->uuid eq $uuid
2380 or return;
2381
2382 $pl->ob
2383 } else {
2384 warn "$ref: cannot resolve object reference\n";
2385 undef
2386 }
2387}
2388
2204package cf; 2389package cf;
2205 2390
2206=back 2391=back
2207 2392
2208=head3 cf::object::player 2393=head3 cf::object::player
2240 $self->message ($msg, $flags); 2425 $self->message ($msg, $flags);
2241 } 2426 }
2242 } 2427 }
2243} 2428}
2244 2429
2430=item $object->send_msg ($channel, $msg, $color, [extra...])
2431
2432=cut
2433
2434sub cf::object::send_msg {
2435 my $pl = shift->contr
2436 or return;
2437 $pl->send_msg (@_);
2438}
2439
2245=item $player_object->may ("access") 2440=item $player_object->may ("access")
2246 2441
2247Returns wether the given player is authorized to access resource "access" 2442Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2443(e.g. "command_wizcast").
2249 2444
2326 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2329 2524
2330 $map->load; 2525 $map->load;
2331 $map->load_diag; 2526 $map->load_neighbours;
2332 2527
2333 return unless $self->contr->active; 2528 return unless $self->contr->active;
2334 $self->activate_recursive; 2529 $self->activate_recursive;
2335 2530
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2552
2358 $self->enter_link; 2553 $self->enter_link;
2359 2554
2360 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2361 my $map = eval { 2577 my $map = eval {
2362 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2363 2579
2364 if ($map) { 2580 if ($map) {
2365 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2367 } else { 2583 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2585 }
2370 2586
2371 $map 2587 $map
2372 }; 2588 };
2373 2589
2426 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2427 } 2643 }
2428 2644
2429 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2430 2646
2431 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2432 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2434 2650
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2463 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2466 2682
2467 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2468 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2469 unless (eval { 2687 unless (eval {
2470 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2471 2689
2472 1; 2690 1;
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2725the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2509 2727
2510=cut 2728=cut
2511 2729
2730# non-persistent channels (usually the info channel)
2731our %CHANNEL = (
2732 "c/identify" => {
2733 id => "infobox",
2734 title => "Identify",
2735 reply => undef,
2736 tooltip => "Items recently identified",
2737 },
2738 "c/examine" => {
2739 id => "infobox",
2740 title => "Examine",
2741 reply => undef,
2742 tooltip => "Signs and other items you examined",
2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2780);
2781
2512sub cf::client::send_msg { 2782sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2784
2515 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2516 2786
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2788
2789 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2519 if (ref $channel) { 2798 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2524 } 2804 }
2525 2805
2526 $channel = $channel->{id}; 2806 $channel = $channel->{id};
2527 } 2807 }
2528 2808
2529 return unless @extra || length $msg; 2809 return unless @extra || length $msg;
2530 2810
2531 if ($self->can_msg) { 2811 if ($self->can_msg) {
2812 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF;
2815
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2816 $self->send_packet ("msg " . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2818 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829
2830 $color &= cf::NDI_COLOR_MASK;
2831
2832 utf8::encode $msg;
2833
2545 if (0 && $msg =~ /\[/) { 2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2837 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2839 $self->send_packet ("drawinfo $color $msg")
2550 } 2840 }
2551 } 2841 }
2559=cut 2849=cut
2560 2850
2561sub cf::client::ext_msg($$@) { 2851sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2852 my ($self, $type, @msg) = @_;
2563 2853
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2854 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2856 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2857 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 }
2860}
2861
2862=item $client->ext_reply ($msgid, @msg)
2863
2864Sends an ext reply to the client.
2865
2866=cut
2867
2868sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_;
2870
2871 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2877 }
2572} 2878}
2573 2879
2574=item $success = $client->query ($flags, "text", \&cb) 2880=item $success = $client->query ($flags, "text", \&cb)
2636 my ($type, $reply, @payload) = 2942 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2943 "ARRAY" eq ref $msg
2638 ? @$msg 2944 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2946
2947 my @reply;
2948
2641 if (my $cb = $EXTICMD{$type}) { 2949 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2950 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2647 } else { 2956 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2958 }
2650 2959
2651 cf::override; 2960 cf::override;
2698our $safe = new Safe "safe"; 3007our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3008our $safe_hole = new Safe::Hole;
2700 3009
2701$SIG{FPE} = 'IGNORE'; 3010$SIG{FPE} = 'IGNORE';
2702 3011
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3012$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math
3014 grepstart grepwhile mapstart mapwhile
3015 sort time
3016));
2704 3017
2705# here we export the classes and methods available to script code 3018# here we export the classes and methods available to script code
2706 3019
2707=pod 3020=pod
2708 3021
2709The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2710 3023
2711 cf::object 3024 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3025 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3026 insert remove name archname title slaying race decrease_ob_nr
2714 3027
2715 cf::object::player 3028 cf::object::player
2716 player 3029 player
2717 3030
2718 cf::player 3031 cf::player
2723 3036
2724=cut 3037=cut
2725 3038
2726for ( 3039for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race
2728 insert remove)], 3042 decrease_ob_nr destroy)],
2729 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2732) { 3046) {
2733 no strict 'refs'; 3047 no strict 'refs';
2809# the server's init and main functions 3123# the server's init and main functions
2810 3124
2811sub load_facedata($) { 3125sub load_facedata($) {
2812 my ($path) = @_; 3126 my ($path) = @_;
2813 3127
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133
2814 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2815 3135
2816 my $facedata; 3136 my $facedata;
2817 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3138 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3140 $facedata = Coro::Storable::thaw $facedata;
2821 3141
2822 $facedata->{version} == 2 3142 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3144
3145 # patch in the exptable
3146 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3149 };
3150 cf::cede_to_tick;
3151
2825 { 3152 {
2826 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2827 3154
2828 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2830 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3162
2835 cf::cede_to_tick; 3163 cf::cede_to_tick;
2836 } 3164 }
2837 3165
2838 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2840 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2841 or next; 3170 or next;
3171
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3175 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3193
2864 { 3194 {
2865 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3198
2870 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3200 if (defined $info->{type}) {
2872 name => $name,
2873 copyright => $info->{copyright}, #TODO#
2874 });
2875
2876 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
2877 3203
2878 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
2879 # prepend meta info 3205 # prepend meta info
2880 3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
2881 my $data = pack "(w/a*)*", $meta, $info->{data}; 3212 $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3213 } else {
3214 $data = $info->{data};
3215 }
2883 3216
2884 cf::face::set_data $idx, 0, $data, $chk; 3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
2885 } else { 3219 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3220 $RESOURCE{$name} = $info;
2887 } 3221 }
2888 3222
2889 cf::face::set_type $idx, $info->{type};
2890
2891 cf::cede_to_tick; 3223 cf::cede_to_tick;
2892 } 3224 }
2893 } 3225 }
2894 3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228
2895 1 3229 1
2896} 3230}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
2897 3251
2898register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
2900 3254
2901 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v); 3256 $ns->fx_want ($k, $v);
2903 } 3257 }
2904}; 3258};
2905 3259
2906sub reload_regions { 3260sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = ();
3264
2907 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2908 or die "unable to load regions file\n"; 3266 or die "unable to load regions file\n";
2909 3267
2910 for (cf::region::list) { 3268 for (cf::region::list) {
2911 $_->{match} = qr/$_->{match}/ 3269 $_->{match} = qr/$_->{match}/
2947 3305
2948sub init { 3306sub init {
2949 reload_resources; 3307 reload_resources;
2950} 3308}
2951 3309
2952sub cfg_load { 3310sub reload_config {
2953 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2954 or return; 3312 or return;
2955 3313
2956 local $/; 3314 local $/;
2957 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2958 3316
2959 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2960 3318
2961 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2962 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2973sub main { 3331sub main {
2974 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
2975 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
2976 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2977 (async { 3335 (async {
2978 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
2979 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
2980 }; 3339 };
2981 3340
2982 cfg_load; 3341 reload_config;
2983 db_init; 3342 db_init;
2984 load_extensions; 3343 load_extensions;
2985 3344
2986 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2987 Event::loop; 3347 EV::loop;
2988} 3348}
2989 3349
2990############################################################################# 3350#############################################################################
2991# initialisation and cleanup 3351# initialisation and cleanup
2992 3352
2993# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
2994BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
2995 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
2996 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2997 reentrant => 0,
2998 data => WF_AUTOCANCEL,
2999 signal => $signal,
3000 prio => 0,
3001 cb => sub {
3002 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3003 },
3004 ); 3359 };
3005 } 3360 }
3006} 3361}
3007 3362
3008sub write_runtime { 3363sub write_runtime {
3009 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
3054 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3055 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3056 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3057 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3058 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3059 $pl->save; 3415 $pl->save;
3060 } 3416 }
3061 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3062 3418
3063 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
3102 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3103 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3104 3460
3105 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
3106 3462
3107 warn "cancelling all WF_AUTOCANCEL watchers";
3108 for (Event::all_watchers) {
3109 $_->cancel if $_->data & WF_AUTOCANCEL;
3110 }
3111
3112 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3113 for (;;) { 3464 for (;;) {
3114 BDB::flush; 3465 BDB::flush;
3115 IO::AIO::flush; 3466 IO::AIO::flush;
3116 Coro::cede; 3467 Coro::cede_notself;
3117 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3118 warn "iterate..."; 3469 warn "iterate...";
3119 } 3470 }
3120 3471
3121 ++$RELOAD; 3472 ++$RELOAD;
3180 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
3181 require cf; 3532 require cf;
3182 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3183 3534
3184 warn "loading config and database again"; 3535 warn "loading config and database again";
3185 cf::cfg_load; 3536 cf::reload_config;
3186 3537
3187 warn "loading extensions"; 3538 warn "loading extensions";
3188 cf::load_extensions; 3539 cf::load_extensions;
3189 3540
3190 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
3210 3561
3211sub reload_perl() { 3562sub reload_perl() {
3212 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3213 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3214 3565
3215 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3216 reentrant => 0,
3217 after => 0,
3218 data => WF_AUTOCANCEL,
3219 cb => sub {
3220 do_reload_perl;
3221 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3222 }, 3568 do_reload_perl;
3223 ); 3569 };
3224} 3570}
3225 3571
3226register_command "reload" => sub { 3572register_command "reload" => sub {
3227 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3228 3574
3229 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3230 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3231 async { reload_perl }; 3579 reload_perl;
3580 };
3232 } 3581 }
3233}; 3582};
3234 3583
3235unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3236 3585
3255 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3256 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3257 $signal->wait; 3606 $signal->wait;
3258} 3607}
3259 3608
3260 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3261 my $avg = 10;
3262$TICK_WATCHER = Event->timer (
3263 reentrant => 0,
3264 parked => 1,
3265 prio => 0,
3266 at => $NEXT_TICK || $TICK,
3267 data => WF_AUTOCANCEL,
3268 cb => sub {
3269 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3270 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3271 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3272 return; 3613 return;
3273 } 3614 }
3274 3615
3275 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3276 3617
3277 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3278 3619
3279 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
3280 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
3281 my $t = Event::time;
3282 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3283 or die;
3284 3622
3285 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3286 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3287 $map->alloc; 3625 Coro::async_pool {
3288 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
3289 my $t = Event::time - $t; 3627 write_runtime
3290 3628 or warn "ERROR: unable to write runtime file: $!";
3291 #next unless $t < 0.0013;#d#
3292 if ($t < $min) {
3293 $min = $t;
3294 }
3295 $avg = $avg * 0.99 + $t * 0.01;
3296 }
3297 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3298 exit 0;
3299 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3300 }; 3629 };
3630 }
3301 3631
3302 $RUNTIME += $TICK;
3303 $NEXT_TICK += $TICK;
3304
3305 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306 $NEXT_RUNTIME_WRITE = $NOW + 10;
3307 Coro::async_pool {
3308 write_runtime
3309 or warn "ERROR: unable to write runtime file: $!";
3310 };
3311 }
3312
3313# my $AFTER = Event::time;
3314# warn $AFTER - $NOW;#d#
3315
3316 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3317 $sig->send; 3633 $sig->send;
3318 } 3634 }
3319 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3320 $sig->send; 3636 $sig->send;
3321 } 3637 }
3322 3638
3323 $NOW = Event::time;
3324
3325 # if we are delayed by four ticks or more, skip them all
3326 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3327
3328 $TICK_WATCHER->at ($NEXT_TICK);
3329 $TICK_WATCHER->start;
3330
3331 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3332 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3333 3641
3334 _post_tick; 3642 _post_tick;
3335 3643};
3336 3644$TICK_WATCHER->priority (EV::MAXPRI);
3337 },
3338);
3339 3645
3340{ 3646{
3341 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
3342 $BDB_POLL_WATCHER = Event->io ( 3648
3343 reentrant => 0,
3344 fd => BDB::poll_fileno,
3345 poll => 'r',
3346 prio => 0,
3347 data => WF_AUTOCANCEL,
3348 cb => \&BDB::poll_cb,
3349 );
3350 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3351 3650 BDB::max_poll_reqs $TICK * 0.1;
3352 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3353 my $status;
3354 my $current = $Coro::current;
3355 (
3356 sub {
3357 $status = $!;
3358 $current->ready; undef $current;
3359 },
3360 sub {
3361 Coro::schedule while defined $current;
3362 $! = $status;
3363 },
3364 )
3365 };
3366 3652
3367 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3368 $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);
3369 3659
3370 cf::sync_job { 3660 cf::sync_job {
3371 eval { 3661 eval {
3372 BDB::db_env_open 3662 BDB::db_env_open
3373 $DB_ENV, 3663 $DB_ENV,
3375 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
3376 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3377 0666; 3667 0666;
3378 3668
3379 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3380
3381 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3382 $DB_ENV->set_lk_detect;
3383 }; 3670 };
3384 3671
3385 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3386 }; 3673 };
3387 } 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 };
3388} 3685}
3389 3686
3390{ 3687{
3688 # configure IO::AIO
3689
3391 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3392
3393 undef $Coro::AIO::WATCHER;
3394 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3395 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3396 reentrant => 0,
3397 data => WF_AUTOCANCEL,
3398 fd => IO::AIO::poll_fileno,
3399 poll => 'r',
3400 prio => 6,
3401 cb => \&IO::AIO::poll_cb,
3402 );
3403} 3693}
3404 3694
3405my $_log_backtrace; 3695my $_log_backtrace;
3406 3696
3407sub _log_backtrace { 3697sub _log_backtrace {
3411 3701
3412 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3413 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3414 ++$_log_backtrace; 3704 ++$_log_backtrace;
3415 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3416 my @bt = fork_call { 3708 my @bt = fork_call {
3417 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3418 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3419 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 |"
3420 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines