ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines