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.312 by root, Sat Jul 21 18:01:26 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
356=item cf::get_slot $time[, $priority[, $name]]
357
358Allocate $time seconds of blocking CPU time at priority C<$priority>:
359This call blocks and returns only when you have at least C<$time> seconds
360of cpu time till the next tick. The slot is only valid till the next cede.
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
365Useful for short background jobs.
366
367=cut
368
369our @SLOT_QUEUE;
370our $SLOT_QUEUE;
371
372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
376 my $signal = new Coro::Signal;
377
378 while () {
379 next_job:
380 my $avail = cf::till_tick;
381 if ($avail > 0.01) {
382 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) {
384 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send;
386 Coro::cede;
387 goto next_job;
388 }
389 }
390 }
391
392 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait;
396 } else {
397 Coro::schedule;
398 }
399 }
400};
401
402sub get_slot($;$$) {
403 my ($time, $pri, $name) = @_;
404
405 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal;
407
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready;
411 $sig->wait;
412}
413
327=item cf::async { BLOCK } 414=item cf::async { BLOCK }
328 415
329Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 417C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
334 421
335BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
336 423
337=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
338 425
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 429acceptable.
343 430
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
350 437
351sub sync_job(&) { 438sub sync_job(&) {
352 my ($job) = @_; 439 my ($job) = @_;
353 440
354 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 442 my $time = EV::time;
356 443
357 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
359 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
360 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 450 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
363 452
364 my $busy = 1; 453 my $busy = 1;
365 my @res; 454 my @res;
366 455
367 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 458 @res = eval { $job->() };
369 warn $@ if $@; 459 warn $@ if $@;
370 undef $busy; 460 undef $busy;
371 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
372 462
373 while ($busy) { 463 while ($busy) {
374 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
375 } 468 }
469 }
376 470
377 $time = Event::time - $time; 471 $time = EV::time - $time;
378 472
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381 475
382 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
412=item fork_call { }, $args 506=item fork_call { }, $args
413 507
414Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
418 512
419=cut 513=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 514
430sub fork_call(&@) { 515sub fork_call(&@) {
431 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
432 517
433# 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,
434# or die "socketpair: $!"; 519 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 520 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 521
438 if (my $pid = fork) { 522 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 523 reset_signals;
452 local $SIG{__WARN__}; 524 &$cb
453 local $SIG{__DIE__}; 525 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 526
460 eval { 527 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 528}
473 529
474=item $value = cf::db_get $family => $key 530=item $value = cf::db_get $family => $key
475 531
476Returns a single value from the environment database. 532Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
479 535
480Stores 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
481data 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).
482 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
483=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}
484 562
485our $DB; 563our $DB;
486 564
487sub db_init { 565sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 566 cf::sync_job {
492 eval { 567 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 568 };
502} 569}
503 570
504sub db_get($$) { 571sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
506 573
556 if (1) { 623 if (1) {
557 $md5 = 624 $md5 =
558 join "\x00", 625 join "\x00",
559 $processversion, 626 $processversion,
560 map { 627 map {
561 Coro::cede; 628 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 630 } 0.. $#$src;
564 631
565 632
566 my $dbmd5 = db_get cache => "$id/md5"; 633 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
612 679
613In 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>
614C<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
615Crossfire TRT). 682Deliantra).
616 683
617=over 4 684=over 4
618 685
619=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
620 687
902 } 969 }
903 970
904 0 971 0
905} 972}
906 973
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 975
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 977
911Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
912 979
918 985
919=cut 986=cut
920 987
921############################################################################# 988#############################################################################
922# object support 989# object support
923#
924 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#
925sub _can_merge { 1024sub _can_merge {
926 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
927 1026
928 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1028
932 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
933} 1031}
934 1032
935sub reattach { 1033sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1035 my ($obj) = @_;
959cf::attachable->attach ( 1057cf::attachable->attach (
960 prio => -1000000, 1058 prio => -1000000,
961 on_instantiate => sub { 1059 on_instantiate => sub {
962 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
963 1061
964 $data = from_json $data; 1062 $data = decode_json $data;
965 1063
966 for (@$data) { 1064 for (@$data) {
967 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
968 1066
969 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1083sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
987 1085
988 sync_job { 1086 sync_job {
989 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
992 1091
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1096 close $fh;
998 1097
999 if (@$objs) { 1098 if (@$objs) {
1000 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) {
1001 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1104 close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1106 }
1015 } 1114 }
1016 } else { 1115 } else {
1017 aio_unlink $filename; 1116 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1019 } 1118 }
1020 } 1119 };
1021} 1120}
1022 1121
1023sub object_freezer_as_string { 1122sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1025 1124
1037 or return; 1136 or return;
1038 1137
1039 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1140 or return;
1141
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1043 } 1144 }
1044 1145
1146 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1149
1047 return ($data, $av); 1150 ($data, $av)
1048} 1151}
1049 1152
1050=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1051 1154
1052=over 4 1155=over 4
1125 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
1126 1229
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1231
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
1135 } else { 1247 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1249 }
1138 1250
1139 cf::override; 1251 cf::override;
1229 1341
1230=head3 cf::player 1342=head3 cf::player
1231 1343
1232=over 4 1344=over 4
1233 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
1234=item cf::player::find $login 1360=item cf::player::find $login
1235 1361
1236Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1237 1363
1238=cut 1364=cut
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1403
1278 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1279 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;
1280 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1281 } 1412 }
1282 } 1413 }
1283} 1414}
1284 1415
1294 1425
1295 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1297 1428
1298 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1299 Coro::cede; 1430 cf::cede_to_tick;
1300} 1431}
1301 1432
1302sub new($) { 1433sub new($) {
1303 my ($login) = @_; 1434 my ($login) = @_;
1304 1435
1308 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1309 1440
1310 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1311 1442
1312 $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 (@_);
1313} 1454}
1314 1455
1315=item $pl->quit_character 1456=item $pl->quit_character
1316 1457
1317Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1513 or return [];
1373 1514
1374 my @logins; 1515 my @logins;
1375 1516
1376 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") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1380 1526
1381 utf8::decode $login; 1527 utf8::decode $login;
1382 push @logins, $login; 1528 push @logins, $login;
1383 } 1529 }
1384 1530
1417 1563
1418Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1419 1565
1420=cut 1566=cut
1421 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
1422sub expand_cfpod { 1579sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1424 1581
1425 # escape & and < 1582 my $xml;
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428 1583
1429 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1430 1587
1431 1 while 1588 $group =~ s/&/&amp;/g;
1432 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1436 # replace G<male|female> tags 1593 ([BCGHITU])
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1594 <
1438 $self->gender ? $2 : $1 1595 (?:
1439 }ge 1596 ([^<>]*) (?{ $group = $^N })
1440 # replace H<hint text> 1597 | < $interior >
1441 || s{H<([^\>]*)>} 1598 )
1599 >
1600 %gcsx
1442 { 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") {
1443 ("<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>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "") 1621 "")
1446 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1447 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1448 1633
1634 for ($xml) {
1449 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1451 1637
1452 # compress some whitespace 1638 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1457 1644
1458 $_ 1645 $xml
1459} 1646}
1647
1648no re 'eval';
1460 1649
1461sub hintmode { 1650sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1652 $_[0]{hintmode}
1464} 1653}
1465 1654
1466=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1467 1656
1468Sends an ext reply to the player. 1657Sends an ext reply to the player.
1469 1658
1470=cut 1659=cut
1471 1660
1472sub ext_reply($$%) { 1661sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1474 1663
1475 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1665}
1478 1666
1479=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1480 1668
1481Sends an ext event to the client. 1669Sends an ext event to the client.
1482 1670
1483=cut 1671=cut
1484 1672
1485sub ext_event($$%) { 1673sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1487 1675
1488 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1489} 1677}
1490 1678
1491=head3 cf::region 1679=head3 cf::region
1492 1680
1493=over 4 1681=over 4
1709 1897
1710sub load_header_from($) { 1898sub load_header_from($) {
1711 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1712 1900
1713 utf8::encode $path; 1901 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 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;
1719 1910
1720 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1721 1912
1722 1 1913 1
1723} 1914}
1777sub find { 1968sub find {
1778 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1779 1970
1780 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1781 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1783 1975
1784 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1785 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
1786 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1787 or return; 1981 or return;
1788 1982
1789 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1790 1984
1792 or return; 1986 or return;
1793 1987
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1797 $map->reset; 1993 $map->reset;
1798 undef $guard;
1799 return find $path; 1994 return find $path;
1800 } 1995 }
1801 1996
1802 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1803 } 1998 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1813 2008
1814 my $path = $self->{path}; 2009 my $path = $self->{path};
1815 2010
1816 { 2011 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1818 2013
2014 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2016
1821 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1822 2018
1823 $self->alloc; 2019 $self->alloc;
1824 2020
1825 $self->pre_load; 2021 $self->pre_load;
1826 Coro::cede; 2022 cf::cede_to_tick;
1827 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1829 or return; 2027 or return;
1830 2028
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1833 2031
1834 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2033 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2036 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1839 } 2040 }
1840 } 2041 }
1841 2042
1842 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1843 # now do the right thing for maps 2046 # now do the right thing for maps
1844 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2049 unless $self->difficulty;
1847 Coro::cede; 2050 cf::cede_to_tick;
1848 2051
1849 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2053 $self->decay_objects;
1851 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1852 $self->update_buttons; 2055 $self->update_buttons;
1853 Coro::cede; 2056 cf::cede_to_tick;
1854 $self->set_darkness_map; 2057 $self->set_darkness_map;
1855 Coro::cede; 2058 cf::cede_to_tick;
1856 $self->activate; 2059 $self->activate;
1857 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1858 2064
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 2066 }
1861 2067
1862 $self->post_load; 2068 $self->post_load;
1873 2079
1874 $self 2080 $self
1875} 2081}
1876 2082
1877# 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
1878sub load_diag { 2084sub load_neighbours {
1879 my ($map) = @_; 2085 my ($map) = @_;
1880 2086
1881 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1882 2088
1883 for (0 .. 3) { 2089 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1885 or next; 2091 or next;
1886 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1887 or next; 2093 or next;
1888 $neigh->load; 2094 $neigh->load;
1889 2095
2096 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2099 }
1893 2100
1894 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1896 or next; 2104 or next;
1897 $neigh->load; 2105 $neigh->load;
1898 } 2106 }
1899} 2107}
1900 2108
1905} 2113}
1906 2114
1907sub do_load_sync { 2115sub do_load_sync {
1908 my ($map) = @_; 2116 my ($map) = @_;
1909 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1910 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1911} 2122}
1912 2123
1913our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1915 2126
1916sub find_async { 2127sub find_async {
1917 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1918 2129
1919 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1920 2131
1921 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2134 }
1924 2135
1925 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1926 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1927 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2143 if (my $map = find $k) {
1930 $map->load; 2144 $map->load if $v;
1931 } 2145 }
1932 2146
1933 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1934 } 2148 }
1935 } 2149 }
1936 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1937 }; 2151 };
1938 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1941} 2155}
1942 2156
1943sub save { 2157sub save {
1944 my ($self) = @_; 2158 my ($self) = @_;
1945 2159
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2161
1948 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1949 2163
1950 return unless $self->dirty; 2164 return unless $self->dirty;
1951 2165
1957 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1958 2172
1959 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1960 2174
1961 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1963 }; 2178 };
1964 2179
1965 if ($uniq) { 2180 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2189 my ($self) = @_;
1975 2190
1976 # save first because save cedes 2191 # save first because save cedes
1977 $self->save; 2192 $self->save;
1978 2193
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2195
1981 return if $self->players; 2196 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1984 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2204 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2205}
1988 2206
1989sub reset_at { 2207sub reset_at {
1990 my ($self) = @_; 2208 my ($self) = @_;
1991 2209
2023 if $uniq; 2241 if $uniq;
2024 } 2242 }
2025 2243
2026 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2027 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2248 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2249
2032 $self->unlink_save; 2250 $self->unlink_save;
2033 $self->destroy; 2251 $self->destroy;
2034} 2252}
2035 2253
2036my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
2037 2255
2038sub nuke { 2256sub nuke {
2039 my ($self) = @_; 2257 my ($self) = @_;
2040 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2041 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
2042 2263
2043 $self->unlink_save; 2264 $self->unlink_save;
2044 2265
2045 bless $self, "cf::map"; 2266 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2271
2051 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
2052 2274
2053 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2054} 2276}
2055 2277
2056=item $maps = cf::map::tmp_maps 2278=item $maps = cf::map::tmp_maps
2132 2354
2133sub inv_recursive { 2355sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2135} 2357}
2136 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
2137package cf; 2387package cf;
2138 2388
2139=back 2389=back
2140 2390
2141=head3 cf::object::player 2391=head3 cf::object::player
2163 2413
2164 } else { 2414 } else {
2165 my $pl = $self->contr; 2415 my $pl = $self->contr;
2166 2416
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2420
2176 } else { 2421 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2179 } 2424 }
2180 } 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 (@_);
2181} 2436}
2182 2437
2183=item $player_object->may ("access") 2438=item $player_object->may ("access")
2184 2439
2185Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2267 2522
2268 $map->load; 2523 $map->load;
2269 $map->load_diag; 2524 $map->load_neighbours;
2270 2525
2271 return unless $self->contr->active; 2526 return unless $self->contr->active;
2272 $self->activate_recursive; 2527 $self->activate_recursive;
2273 2528
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2550
2296 $self->enter_link; 2551 $self->enter_link;
2297 2552
2298 (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
2299 my $map = eval { 2575 my $map = eval {
2300 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2301 2577
2302 if ($map) { 2578 if ($map) {
2303 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2305 } else { 2581 } else {
2306 $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);
2307 } 2583 }
2308 2584
2309 $map 2585 $map
2310 }; 2586 };
2311 2587
2364 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2365 } 2641 }
2366 2642
2367 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2368 2644
2369 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2370 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2372 2648
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2401 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2404 2680
2405 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2406 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2685 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2409 2687
2410 1; 2688 1;
2445the 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
2446the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2447 2725
2448=cut 2726=cut
2449 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
2450sub cf::client::send_msg { 2780sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2782
2453 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2454 2784
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2458 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
2459 if (ref $channel) { 2796 } elsif (ref $channel) {
2460 # send meta info to client, if not yet sent 2797 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2798 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel; 2799 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel); 2800 $self->ext_msg (channel_info => $channel)
2801 if $self->can_msg;
2464 } 2802 }
2465 2803
2466 $channel = $channel->{id}; 2804 $channel = $channel->{id};
2467 } 2805 }
2468 2806
2807 return unless @extra || length $msg;
2808
2469 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
2470 $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]));
2471 } else { 2816 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 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
2483 if (0 && $msg =~ /\[/) { 2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2835 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2837 $self->send_packet ("drawinfo $color $msg")
2488 } 2838 }
2489 } 2839 }
2490 } 2840 }
2491} 2841}
2492 2842
2493=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2494 2844
2495Sends an ext event to the client. 2845Sends an ext event to the client.
2496 2846
2497=cut 2847=cut
2498 2848
2499sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2501 2851
2502 return unless $self->extcmd; 2852 if ($self->extcmd == 2) {
2503 2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2505 $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 }
2506} 2876}
2507 2877
2508=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2509 2879
2510Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2935 my ($ns, $buf) = @_;
2566 2936
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2938
2569 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
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2947 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2948 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2576 } else { 2954 } else {
2577 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";
2578 } 2956 }
2579 2957
2580 cf::override; 2958 cf::override;
2627our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2629 3007
2630$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2631 3009
2632$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));
2633 3015
2634# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2635 3017
2636=pod 3018=pod
2637 3019
2638The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2639 3021
2640 cf::object 3022 cf::object
2641 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
2642 insert remove 3024 insert remove name archname title slaying race decrease_ob_nr
2643 3025
2644 cf::object::player 3026 cf::object::player
2645 player 3027 player
2646 3028
2647 cf::player 3029 cf::player
2652 3034
2653=cut 3035=cut
2654 3036
2655for ( 3037for (
2656 ["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
2657 insert remove)], 3040 decrease_ob_nr destroy)],
2658 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2661) { 3044) {
2662 no strict 'refs'; 3045 no strict 'refs';
2738# the server's init and main functions 3121# the server's init and main functions
2739 3122
2740sub load_facedata($) { 3123sub load_facedata($) {
2741 my ($path) = @_; 3124 my ($path) = @_;
2742 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
2743 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2744 3133
2745 my $facedata; 3134 my $facedata;
2746 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3136 or die "$path: $!";
2749 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2750 3139
2751 $facedata->{version} == 2 3140 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753 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
2754 { 3150 {
2755 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2756 3152
2757 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2759 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3160
2764 cf::cede_to_tick; 3161 cf::cede_to_tick;
2765 } 3162 }
2766 3163
2767 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2769 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2770 or next; 3168 or next;
3169
2771 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else { 3173 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2792 3191
2793 { 3192 {
2794 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798 3196
2799 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 3198 if (defined $info->{type}) {
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
2807 3201
2808 if ($name =~ /\.jpg$/) { 3202 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3203 # prepend meta info
2810 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};
2811 } else { 3217 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3218 $RESOURCE{$name} = $info;
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3219 }
2818 3220
2819 cf::cede_to_tick; 3221 cf::cede_to_tick;
2820 } 3222 }
2821 } 3223 }
2822 3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3226
2823 1 3227 1
2824} 3228}
2825 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
2826sub 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
2827 load_resource_file "$MAPDIR/regions" 3263 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3264 or die "unable to load regions file\n";
2829 3265
2830 for (cf::region::list) { 3266 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3267 $_->{match} = qr/$_->{match}/
2867 3303
2868sub init { 3304sub init {
2869 reload_resources; 3305 reload_resources;
2870} 3306}
2871 3307
2872sub cfg_load { 3308sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3309 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3310 or return;
2875 3311
2876 local $/; 3312 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3313 *CFG = YAML::Syck::Load <$fh>;
2893sub main { 3329sub main {
2894 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
2896 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#
2897 (async { 3333 (async {
2898 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
2900 }; 3337 };
2901 3338
2902 cfg_load; 3339 reload_config;
2903 db_init; 3340 db_init;
2904 load_extensions; 3341 load_extensions;
2905 3342
2906 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2907 Event::loop; 3345 EV::loop;
2908} 3346}
2909 3347
2910############################################################################# 3348#############################################################################
2911# initialisation and cleanup 3349# initialisation and cleanup
2912 3350
2913# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
2914BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
2923 },
2924 ); 3357 };
2925 } 3358 }
2926} 3359}
2927 3360
2928sub write_runtime { 3361sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
2974 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3413 $pl->save;
2980 } 3414 }
2981 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
2982 3416
2983 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
3022 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3458
3025 # 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
3026 3460
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3033 for (;;) { 3462 for (;;) {
3034 BDB::flush; 3463 BDB::flush;
3035 IO::AIO::flush; 3464 IO::AIO::flush;
3036 Coro::cede; 3465 Coro::cede_notself;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
3038 warn "iterate..."; 3467 warn "iterate...";
3039 } 3468 }
3040 3469
3041 ++$RELOAD; 3470 ++$RELOAD;
3100 warn "reloading cf.pm"; 3529 warn "reloading cf.pm";
3101 require cf; 3530 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3532
3104 warn "loading config and database again"; 3533 warn "loading config and database again";
3105 cf::cfg_load; 3534 cf::reload_config;
3106 3535
3107 warn "loading extensions"; 3536 warn "loading extensions";
3108 cf::load_extensions; 3537 cf::load_extensions;
3109 3538
3110 warn "reattaching attachments to objects/players"; 3539 warn "reattaching attachments to objects/players";
3130 3559
3131sub reload_perl() { 3560sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3134 3563
3135 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3142 }, 3566 do_reload_perl;
3143 ); 3567 };
3144} 3568}
3145 3569
3146register_command "reload" => sub { 3570register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3148 3572
3149 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3577 reload_perl;
3578 };
3152 } 3579 }
3153}; 3580};
3154 3581
3155unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3156 3583
3175 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3604 $signal->wait;
3178} 3605}
3179 3606
3180 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3190 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"
3191 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3192 return; 3611 return;
3193 } 3612 }
3194 3613
3195 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3196 3615
3197 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3198 3617
3199 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
3200 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204 3620
3205 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3206 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3207 $map->alloc; 3623 Coro::async_pool {
3208 $map->_load_objects ("/tmp/x.map", 1); 3624 $Coro::current->{desc} = "runtime saver";
3209 my $t = Event::time - $t; 3625 write_runtime
3210 3626 or warn "ERROR: unable to write runtime file: $!";
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3627 };
3628 }
3221 3629
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3631 $sig->send;
3238 } 3632 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3634 $sig->send;
3241 } 3635 }
3242 3636
3243 $NOW = Event::time;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3639
3254 _post_tick; 3640 _post_tick;
3255 3641};
3256 3642$TICK_WATCHER->priority (EV::MAXPRI);
3257 },
3258);
3259 3643
3260{ 3644{
3261 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
3262 $BDB_POLL_WATCHER = Event->io ( 3646
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3271 3648 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3650
3287 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3288 $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);
3289 3657
3290 cf::sync_job { 3658 cf::sync_job {
3291 eval { 3659 eval {
3292 BDB::db_env_open 3660 BDB::db_env_open
3293 $DB_ENV, 3661 $DB_ENV,
3295 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
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3665 0666;
3298 3666
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3668 };
3304 3669
3305 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3671 };
3307 } 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 };
3308} 3683}
3309 3684
3310{ 3685{
3686 # configure IO::AIO
3687
3311 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3312
3313 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3691}
3324 3692
3325my $_log_backtrace; 3693my $_log_backtrace;
3326 3694
3327sub _log_backtrace { 3695sub _log_backtrace {
3331 3699
3332 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3702 ++$_log_backtrace;
3335 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3336 my @bt = fork_call { 3706 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 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 |"
3340 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines