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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
195 210
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 227)) {
213 no strict 'refs'; 228 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 230}
216 231
217$Event::DIED = sub { 232$EV::DIED = sub {
218 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
219}; 234};
220 235
221############################################################################# 236#############################################################################
222 237
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 261 $d
247 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
248} 263}
249 264
250=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
251 266
252Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
253 268
254=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
255 270
256Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
257 272
258=cut 273=cut
259 274
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 276
262sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
264 279
265=item cf::lock_wait $string 280=item cf::lock_wait $string
266 281
267Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
268 283
271Wait until the given lock is available and then acquires it and returns 286Wait 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, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
274returned. 289returned.
275 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
276Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
278 296
279=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
280 298
281Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
282 300
283=cut 301=cut
284 302
285our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
286 305
287sub lock_wait($) { 306sub lock_wait($) {
288 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
289 313
290 # wait for lock, if any 314 # wait for lock, if any
291 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 317 Coro::schedule;
299 323
300 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
301 lock_wait $key; 325 lock_wait $key;
302 326
303 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
304 329
305 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
308 } 334 }
309} 335}
310 336
322 }; 348 };
323 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
324 $guard 350 $guard
325} 351}
326 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
327=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
328 369
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 371This 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. 372of cpu time till the next tick. The slot is only valid till the next cede.
340our @SLOT_QUEUE; 381our @SLOT_QUEUE;
341our $SLOT_QUEUE; 382our $SLOT_QUEUE;
342 383
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
345 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
346 389
347 while () { 390 while () {
348 next_job: 391 next_job:
349 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
357 } 400 }
358 } 401 }
359 } 402 }
360 403
361 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 407 $signal->wait;
365 } else { 408 } else {
366 Coro::schedule; 409 Coro::schedule;
367 } 410 }
390 433
391BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
392 435
393=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
394 437
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 439is 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 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 441acceptable.
399 442
400If it must be done, put the blocking parts into C<sync_job>. This will run 443If 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 444the given BLOCK in another coroutine while waiting for the result. The
406 449
407sub sync_job(&) { 450sub sync_job(&) {
408 my ($job) = @_; 451 my ($job) = @_;
409 452
410 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 454 my $time = EV::time;
412 455
413 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
415 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
416 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 462 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
419 464
420 my $busy = 1; 465 my $busy = 1;
421 my @res; 466 my @res;
422 467
423 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 470 @res = eval { $job->() };
425 warn $@ if $@; 471 warn $@ if $@;
426 undef $busy; 472 undef $busy;
427 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
428 474
429 while ($busy) { 475 while ($busy) {
430 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
431 } 480 }
481 }
432 482
433 $time = Event::time - $time; 483 $time = EV::time - $time;
434 484
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 487
438 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
468=item fork_call { }, $args 518=item fork_call { }, $args
469 519
470Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
474 524
475=cut 525=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 526
486sub fork_call(&@) { 527sub fork_call(&@) {
487 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
488 529
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 530 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 533
494 if (my $pid = fork) { 534 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; 535 reset_signals;
508 local $SIG{__WARN__}; 536 &$cb
509 local $SIG{__DIE__}; 537 }, @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 538
516 eval { 539 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} 540}
529 541
530=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
531 543
532Returns a single value from the environment database. 544Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
535 547
536Stores the given C<$value> in the family. It can currently store binary 548Stores 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). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
539=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
540 574
541our $DB; 575our $DB;
542 576
543sub db_init { 577sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 578 cf::sync_job {
548 eval { 579 $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 } 580 };
558} 581}
559 582
560sub db_get($$) { 583sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
562 585
612 if (1) { 635 if (1) {
613 $md5 = 636 $md5 =
614 join "\x00", 637 join "\x00",
615 $processversion, 638 $processversion,
616 map { 639 map {
617 Coro::cede; 640 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 642 } 0.. $#$src;
620 643
621 644
622 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
668 691
669In the following description, CLASS can be any of C<global>, C<object> 692In 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 693C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 694Deliantra).
672 695
673=over 4 696=over 4
674 697
675=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
676 699
958 } 981 }
959 982
960 0 983 0
961} 984}
962 985
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 987
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 989
967Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
968 991
974 997
975=cut 998=cut
976 999
977############################################################################# 1000#############################################################################
978# object support 1001# object support
979#
980 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
981sub _can_merge { 1036sub _can_merge {
982 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
983 1038
984 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1040
988 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
989} 1043}
990 1044
991sub reattach { 1045sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1047 my ($obj) = @_;
1015cf::attachable->attach ( 1069cf::attachable->attach (
1016 prio => -1000000, 1070 prio => -1000000,
1017 on_instantiate => sub { 1071 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1019 1073
1020 $data = from_json $data; 1074 $data = decode_json $data;
1021 1075
1022 for (@$data) { 1076 for (@$data) {
1023 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1024 1078
1025 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1095sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1043 1097
1044 sync_job { 1098 sync_job {
1045 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1048 1103
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1108 close $fh;
1054 1109
1055 if (@$objs) { 1110 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1116 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1118 }
1071 } 1126 }
1072 } else { 1127 } else {
1073 aio_unlink $filename; 1128 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1075 } 1130 }
1076 } 1131 };
1077} 1132}
1078 1133
1079sub object_freezer_as_string { 1134sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1081 1136
1093 or return; 1148 or return;
1094 1149
1095 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1152 or return;
1153
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1099 } 1156 }
1100 1157
1158 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1103 return ($data, $av); 1162 ($data, $av)
1104} 1163}
1105 1164
1106=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1107 1166
1108=over 4 1167=over 4
1186 my ($type, $reply, @payload) = 1245 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1246 "ARRAY" eq ref $msg
1188 ? @$msg 1247 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1249
1250 my @reply;
1251
1191 if (my $cb = $EXTCMD{$type}) { 1252 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1253 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1197 } else { 1259 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1261 }
1200 1262
1201 cf::override; 1263 cf::override;
1291 1353
1292=head3 cf::player 1354=head3 cf::player
1293 1355
1294=over 4 1356=over 4
1295 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1296=item cf::player::find $login 1372=item cf::player::find $login
1297 1373
1298Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1299 1375
1300=cut 1376=cut
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1415
1340 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1343 } 1424 }
1344 } 1425 }
1345} 1426}
1346 1427
1356 1437
1357 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1359 1440
1360 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1361 Coro::cede; 1442 cf::cede_to_tick;
1362} 1443}
1363 1444
1364sub new($) { 1445sub new($) {
1365 my ($login) = @_; 1446 my ($login) = @_;
1366 1447
1444 or return []; 1525 or return [];
1445 1526
1446 my @logins; 1527 my @logins;
1447 1528
1448 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1452 1538
1453 utf8::decode $login; 1539 utf8::decode $login;
1454 push @logins, $login; 1540 push @logins, $login;
1455 } 1541 }
1456 1542
1489 1575
1490Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1491 1577
1492=cut 1578=cut
1493 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1494sub expand_cfpod { 1591sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1496 1593
1497 # escape & and < 1594 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1595
1501 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1502 1599
1503 1 while 1600 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1605 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1510 $self->gender ? $2 : $1 1607 (?:
1511 }ge 1608 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1609 | < $interior >
1513 || s{H<([^\>]*)>} 1610 )
1611 >
1612 %gcsx
1514 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1633 "")
1518 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1520 1645
1646 for ($xml) {
1521 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1523 1649
1524 # compress some whitespace 1650 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1529 1656
1530 $_ 1657 $xml
1531} 1658}
1659
1660no re 'eval';
1532 1661
1533sub hintmode { 1662sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1664 $_[0]{hintmode}
1536} 1665}
1542=cut 1671=cut
1543 1672
1544sub ext_reply($$@) { 1673sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1674 my ($self, $id, @msg) = @_;
1546 1675
1547 if ($self->ns->extcmd == 2) { 1676 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1677}
1555 1678
1556=item $player->ext_msg ($type, @msg) 1679=item $player->ext_msg ($type, @msg)
1557 1680
1558Sends an ext event to the client. 1681Sends an ext event to the client.
1786 1909
1787sub load_header_from($) { 1910sub load_header_from($) {
1788 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1789 1912
1790 utf8::encode $path; 1913 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1796 1922
1797 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1798 1924
1799 1 1925 1
1800} 1926}
1854sub find { 1980sub find {
1855 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1856 1982
1857 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1858 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1860 1987
1861 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1863 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1864 or return; 1993 or return;
1865 1994
1866 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1867 1996
1869 or return; 1998 or return;
1870 1999
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1874 $map->reset; 2005 $map->reset;
1875 undef $guard;
1876 return find $path; 2006 return find $path;
1877 } 2007 }
1878 2008
1879 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1880 } 2010 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1890 2020
1891 my $path = $self->{path}; 2021 my $path = $self->{path};
1892 2022
1893 { 2023 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1895 2025
2026 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2028
1898 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1899 2030
1900 $self->alloc; 2031 $self->alloc;
1901 2032
1902 $self->pre_load; 2033 $self->pre_load;
1903 Coro::cede; 2034 cf::cede_to_tick;
1904 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1906 or return; 2039 or return;
1907 2040
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1910 2043
1911 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2045 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2048 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1916 } 2052 }
1917 } 2053 }
1918 2054
1919 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1920 # now do the right thing for maps 2058 # now do the right thing for maps
1921 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2061 unless $self->difficulty;
1924 Coro::cede; 2062 cf::cede_to_tick;
1925 2063
1926 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2065 $self->decay_objects;
1928 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1929 $self->update_buttons; 2067 $self->update_buttons;
1930 Coro::cede; 2068 cf::cede_to_tick;
1931 $self->set_darkness_map; 2069 $self->set_darkness_map;
1932 Coro::cede; 2070 cf::cede_to_tick;
1933 $self->activate; 2071 $self->activate;
1934 } 2072 }
1935 2073
1936 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
1953 2091
1954 $self 2092 $self
1955} 2093}
1956 2094
1957# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2096sub load_neighbours {
1959 my ($map) = @_; 2097 my ($map) = @_;
1960 2098
1961 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1962 2100
1963 for (0 .. 3) { 2101 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1965 or next; 2103 or next;
1966 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1967 or next; 2105 or next;
1968 $neigh->load; 2106 $neigh->load;
1969 2107
2108 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2111 }
1973 2112
1974 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1976 or next; 2116 or next;
1977 $neigh->load; 2117 $neigh->load;
1978 } 2118 }
1979} 2119}
1980 2120
1985} 2125}
1986 2126
1987sub do_load_sync { 2127sub do_load_sync {
1988 my ($map) = @_; 2128 my ($map) = @_;
1989 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1990 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1991} 2134}
1992 2135
1993our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1995 2138
1996sub find_async { 2139sub find_async {
1997 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1998 2141
1999 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2000 2143
2001 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2146 }
2004 2147
2005 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
2006 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
2007 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2155 if (my $map = find $k) {
2010 $map->load; 2156 $map->load if $v;
2011 } 2157 }
2012 2158
2013 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
2014 } 2160 }
2015 } 2161 }
2016 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
2017 }; 2163 };
2018 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
2021} 2167}
2022 2168
2023sub save { 2169sub save {
2024 my ($self) = @_; 2170 my ($self) = @_;
2025 2171
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2173
2028 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
2029 2175
2030 return unless $self->dirty; 2176 return unless $self->dirty;
2031 2177
2037 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2038 2184
2039 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2040 2186
2041 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2043 }; 2190 };
2044 2191
2045 if ($uniq) { 2192 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2054 my ($self) = @_; 2201 my ($self) = @_;
2055 2202
2056 # save first because save cedes 2203 # save first because save cedes
2057 $self->save; 2204 $self->save;
2058 2205
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2207
2061 return if $self->players; 2208 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2064 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2216 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2217}
2068 2218
2069sub reset_at { 2219sub reset_at {
2070 my ($self) = @_; 2220 my ($self) = @_;
2071 2221
2103 if $uniq; 2253 if $uniq;
2104 } 2254 }
2105 2255
2106 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2107 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2260 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2261
2112 $self->unlink_save; 2262 $self->unlink_save;
2113 $self->destroy; 2263 $self->destroy;
2114} 2264}
2115 2265
2116my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2117 2267
2118sub nuke { 2268sub nuke {
2119 my ($self) = @_; 2269 my ($self) = @_;
2120 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2121 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2122 2275
2123 $self->unlink_save; 2276 $self->unlink_save;
2124 2277
2125 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2283
2131 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2132 2286
2133 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2134} 2288}
2135 2289
2136=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
2212 2366
2213sub inv_recursive { 2367sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2215} 2369}
2216 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2217package cf; 2399package cf;
2218 2400
2219=back 2401=back
2220 2402
2221=head3 cf::object::player 2403=head3 cf::object::player
2349 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2352 2534
2353 $map->load; 2535 $map->load;
2354 $map->load_diag; 2536 $map->load_neighbours;
2355 2537
2356 return unless $self->contr->active; 2538 return unless $self->contr->active;
2357 $self->activate_recursive; 2539 $self->activate_recursive;
2358 2540
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2562
2381 $self->enter_link; 2563 $self->enter_link;
2382 2564
2383 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2384 my $map = eval { 2587 my $map = eval {
2385 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2386 2589
2387 if ($map) { 2590 if ($map) {
2388 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2390 } else { 2593 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2595 }
2393 2596
2394 $map 2597 $map
2395 }; 2598 };
2396 2599
2449 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2450 } 2653 }
2451 2654
2452 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2453 2656
2454 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2455 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2457 2660
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2486 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2489 2692
2490 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2491 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2697 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2494 2699
2495 1; 2700 1;
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2532 2737
2533=cut 2738=cut
2534 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2535sub cf::client::send_msg { 2792sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2794
2538 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2539 2796
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2542 if (ref $channel) { 2808 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2547 } 2814 }
2548 2815
2549 $channel = $channel->{id}; 2816 $channel = $channel->{id};
2550 } 2817 }
2551 2818
2573 $color &= cf::NDI_COLOR_MASK; 2840 $color &= cf::NDI_COLOR_MASK;
2574 2841
2575 utf8::encode $msg; 2842 utf8::encode $msg;
2576 2843
2577 if (0 && $msg =~ /\[/) { 2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2847 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2849 $self->send_packet ("drawinfo $color $msg")
2582 } 2850 }
2583 } 2851 }
2591=cut 2859=cut
2592 2860
2593sub cf::client::ext_msg($$@) { 2861sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2862 my ($self, $type, @msg) = @_;
2595 2863
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2864 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2866 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2867 push @msg, msgtype => "event_$type";
2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2887 }
2604} 2888}
2605 2889
2606=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
2668 my ($type, $reply, @payload) = 2952 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2953 "ARRAY" eq ref $msg
2670 ? @$msg 2954 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2956
2957 my @reply;
2958
2673 if (my $cb = $EXTICMD{$type}) { 2959 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2960 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2679 } else { 2966 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 2968 }
2682 2969
2683 cf::override; 2970 cf::override;
2743=pod 3030=pod
2744 3031
2745The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2746 3033
2747 cf::object 3034 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove name archname title slaying race 3036 insert remove name archname title slaying race decrease_ob_nr
2750 3037
2751 cf::object::player 3038 cf::object::player
2752 player 3039 player
2753 3040
2754 cf::player 3041 cf::player
2759 3046
2760=cut 3047=cut
2761 3048
2762for ( 3049for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv name archname title slaying race)], 3051 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)],
2765 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2768) { 3056) {
2769 no strict 'refs'; 3057 no strict 'refs';
2845# the server's init and main functions 3133# the server's init and main functions
2846 3134
2847sub load_facedata($) { 3135sub load_facedata($) {
2848 my ($path) = @_; 3136 my ($path) = @_;
2849 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143
2850 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2851 3145
2852 my $facedata; 3146 my $facedata;
2853 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3148 or die "$path: $!";
2856 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2857 3151
2858 $facedata->{version} == 2 3152 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2860 3154
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick;
3161
2861 { 3162 {
2862 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2863 3164
2864 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2866 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3172
2871 cf::cede_to_tick; 3173 cf::cede_to_tick;
2872 } 3174 }
2873 3175
2874 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2876 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2877 or next; 3180 or next;
3181
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3185 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2899 3203
2900 { 3204 {
2901 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907 3208
2908 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({ 3210 if (defined $info->{type}) {
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
2915 3213
2916 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
2917 # prepend meta info 3215 # prepend meta info
2918 3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3223 } else {
3224 $data = $info->{data};
3225 }
2921 3226
2922 cf::face::set_data $idx, 0, $data, $chk; 3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
2923 } else { 3229 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3230 $RESOURCE{$name} = $info;
2925 } 3231 }
2926 3232
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick; 3233 cf::cede_to_tick;
2930 } 3234 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2950 3238
2951 1 3239 1
2952} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
2953 3261
2954register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
2956 3264
2957 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v); 3266 $ns->fx_want ($k, $v);
2959 } 3267 }
2960}; 3268};
2961 3269
2962sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2963 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
2965 3277
2966 for (cf::region::list) { 3278 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3279 $_->{match} = qr/$_->{match}/
3003 3315
3004sub init { 3316sub init {
3005 reload_resources; 3317 reload_resources;
3006} 3318}
3007 3319
3008sub cfg_load { 3320sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3322 or return;
3011 3323
3012 local $/; 3324 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
3014 3326
3015 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3016 3328
3017 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3018 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3029sub main { 3341sub main {
3030 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3345 (async {
3034 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
3035 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3036 }; 3349 };
3037 3350
3038 cfg_load; 3351 reload_config;
3039 db_init; 3352 db_init;
3040 load_extensions; 3353 load_extensions;
3041 3354
3042 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3043 Event::loop; 3357 EV::loop;
3044} 3358}
3045 3359
3046############################################################################# 3360#############################################################################
3047# initialisation and cleanup 3361# initialisation and cleanup
3048 3362
3049# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3050BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3051 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3052 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3053 reentrant => 0,
3054 data => WF_AUTOCANCEL,
3055 signal => $signal,
3056 prio => 0,
3057 cb => sub {
3058 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
3059 },
3060 ); 3369 };
3061 } 3370 }
3062} 3371}
3063 3372
3064sub write_runtime { 3373sub write_runtime {
3065 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
3110 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3425 $pl->save;
3116 } 3426 }
3117 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3118 3428
3119 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
3158 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3159 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3160 3470
3161 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3162 3472
3163 warn "cancelling all WF_AUTOCANCEL watchers";
3164 for (Event::all_watchers) {
3165 $_->cancel if $_->data & WF_AUTOCANCEL;
3166 }
3167
3168 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
3169 for (;;) { 3474 for (;;) {
3170 BDB::flush; 3475 BDB::flush;
3171 IO::AIO::flush; 3476 IO::AIO::flush;
3172 Coro::cede; 3477 Coro::cede_notself;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3174 warn "iterate..."; 3479 warn "iterate...";
3175 } 3480 }
3176 3481
3177 ++$RELOAD; 3482 ++$RELOAD;
3236 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
3237 require cf; 3542 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3544
3240 warn "loading config and database again"; 3545 warn "loading config and database again";
3241 cf::cfg_load; 3546 cf::reload_config;
3242 3547
3243 warn "loading extensions"; 3548 warn "loading extensions";
3244 cf::load_extensions; 3549 cf::load_extensions;
3245 3550
3246 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
3266 3571
3267sub reload_perl() { 3572sub reload_perl() {
3268 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3269 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3270 3575
3271 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3272 reentrant => 0,
3273 after => 0,
3274 data => WF_AUTOCANCEL,
3275 cb => sub {
3276 do_reload_perl; 3577 do_reload_perl;
3277 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3278 },
3279 ); 3579 };
3280} 3580}
3281 3581
3282register_command "reload" => sub { 3582register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3284 3584
3285 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3589 reload_perl;
3590 };
3288 } 3591 }
3289}; 3592};
3290 3593
3291unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3292 3595
3311 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3616 $signal->wait;
3314} 3617}
3315 3618
3316 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer (
3319 reentrant => 0,
3320 parked => 1,
3321 prio => 0,
3322 at => $NEXT_TICK || $TICK,
3323 data => WF_AUTOCANCEL,
3324 cb => sub {
3325 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3326 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3328 return; 3623 return;
3329 } 3624 }
3330 3625
3331 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3332 3627
3333 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3334 3629
3335 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3336 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3337 my $t = Event::time;
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3339 or die;
3340 3632
3341 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3343 $map->alloc; 3635 Coro::async_pool {
3344 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3345 my $t = Event::time - $t; 3637 write_runtime
3346 3638 or warn "ERROR: unable to write runtime file: $!";
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 }; 3639 };
3640 }
3357 3641
3358 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK;
3360
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool {
3364 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!";
3366 };
3367 }
3368
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3643 $sig->send;
3374 } 3644 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3646 $sig->send;
3377 } 3647 }
3378 3648
3379 $NOW = Event::time;
3380
3381 # if we are delayed by four ticks or more, skip them all
3382 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384 $TICK_WATCHER->at ($NEXT_TICK);
3385 $TICK_WATCHER->start;
3386
3387 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3651
3390 _post_tick; 3652 _post_tick;
3391 3653};
3392 3654$TICK_WATCHER->priority (EV::MAXPRI);
3393 },
3394);
3395 3655
3396{ 3656{
3397 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3398 $BDB_POLL_WATCHER = Event->io ( 3658
3399 reentrant => 0,
3400 fd => BDB::poll_fileno,
3401 poll => 'r',
3402 prio => 0,
3403 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb,
3405 );
3406 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3407 3660 BDB::max_poll_reqs $TICK * 0.1;
3408 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3409 my $status;
3410 my $current = $Coro::current;
3411 (
3412 sub {
3413 $status = $!;
3414 $current->ready; undef $current;
3415 },
3416 sub {
3417 Coro::schedule while defined $current;
3418 $! = $status;
3419 },
3420 )
3421 };
3422 3662
3423 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3669
3426 cf::sync_job { 3670 cf::sync_job {
3427 eval { 3671 eval {
3428 BDB::db_env_open 3672 BDB::db_env_open
3429 $DB_ENV, 3673 $DB_ENV,
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3677 0666;
3434 3678
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3680 };
3440 3681
3441 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3683 };
3443 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3444} 3695}
3445 3696
3446{ 3697{
3698 # configure IO::AIO
3699
3447 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3448
3449 undef $Coro::AIO::WATCHER;
3450 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3451 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3452 reentrant => 0,
3453 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno,
3455 poll => 'r',
3456 prio => 6,
3457 cb => \&IO::AIO::poll_cb,
3458 );
3459} 3703}
3460 3704
3461my $_log_backtrace; 3705my $_log_backtrace;
3462 3706
3463sub _log_backtrace { 3707sub _log_backtrace {
3467 3711
3468 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3714 ++$_log_backtrace;
3471 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3472 my @bt = fork_call { 3718 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines