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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 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;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 84our $DB_ENV;
86 85
87our %CFG; 86our %CFG;
88 87
89our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 89our $RUNTIME;
90our $NOW;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
… …
159 159
160The raw value load value from the last tick. 160The raw value load value from the last tick.
161 161
162=item %cf::CFG 162=item %cf::CFG
163 163
164Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 165from wherever your confdir points to.
166 166
167=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
168 168
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
… …
272Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
275returned. 289returned.
276 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
277Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
279 296
280=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
281 298
282Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
283 300
284=cut 301=cut
285 302
286our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
287 305
288sub lock_wait($) { 306sub lock_wait($) {
289 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
290 313
291 # wait for lock, if any 314 # wait for lock, if any
292 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 317 Coro::schedule;
… …
300 323
301 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
302 lock_wait $key; 325 lock_wait $key;
303 326
304 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
305 329
306 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
309 } 334 }
310} 335}
311 336
… …
323 }; 348 };
324 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
325 $guard 350 $guard
326} 351}
327 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
328=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
329 369
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
341our @SLOT_QUEUE; 381our @SLOT_QUEUE;
342our $SLOT_QUEUE; 382our $SLOT_QUEUE;
343 383
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
346 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
347 389
348 while () { 390 while () {
349 next_job: 391 next_job:
350 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
358 } 400 }
359 } 401 }
360 } 402 }
361 403
362 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 407 $signal->wait;
366 } else { 408 } else {
367 Coro::schedule; 409 Coro::schedule;
368 } 410 }
… …
391 433
392BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
393 435
394=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
395 437
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 441acceptable.
400 442
401If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
407 449
408sub sync_job(&) { 450sub sync_job(&) {
409 my ($job) = @_; 451 my ($job) = @_;
410 452
411 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 454 my $time = EV::time;
413 455
414 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
416 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
417 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 462 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
420 464
421 my $busy = 1; 465 my $busy = 1;
422 my @res; 466 my @res;
423 467
424 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 470 @res = eval { $job->() };
426 warn $@ if $@; 471 warn $@ if $@;
427 undef $busy; 472 undef $busy;
428 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
429 474
430 while ($busy) { 475 while ($busy) {
431 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
432 } 480 }
481 }
433 482
434 $time = Event::time - $time; 483 $time = EV::time - $time;
435 484
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438 487
439 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
469=item fork_call { }, $args 518=item fork_call { }, $args
470 519
471Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
475 524
476=cut 525=cut
477 526
478sub fork_call(&@) { 527sub fork_call(&@) {
479 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
480 529
481 # we seemingly have to make a local copy of the whole thing, 530 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 531 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 532 # TODO: investigate and fix (likely this will be rather laborious)
484 533
485 my @res = Coro::Util::fork_eval { 534 my @res = Coro::Util::fork_eval {
486 reset_signals; 535 reset_signals;
487 &$cb 536 &$cb
488 }, @args; 537 }, @args;
… …
497=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
498 547
499Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
502=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
503 574
504our $DB; 575our $DB;
505 576
506sub db_init { 577sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 578 cf::sync_job {
511 eval { 579 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 580 };
521} 581}
522 582
523sub db_get($$) { 583sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
525 585
… …
575 if (1) { 635 if (1) {
576 $md5 = 636 $md5 =
577 join "\x00", 637 join "\x00",
578 $processversion, 638 $processversion,
579 map { 639 map {
580 Coro::cede; 640 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 642 } 0.. $#$src;
583 643
584 644
585 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
… …
629attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
631 691
632In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 694Deliantra).
635 695
636=over 4 696=over 4
637 697
638=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
639 699
… …
921 } 981 }
922 982
923 0 983 0
924} 984}
925 985
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 987
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 989
930Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
931 991
… …
937 997
938=cut 998=cut
939 999
940############################################################################# 1000#############################################################################
941# object support 1001# object support
942#
943 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
944sub _can_merge { 1036sub _can_merge {
945 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
946 1038
947 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1040
951 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
952} 1043}
953 1044
954sub reattach { 1045sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1047 my ($obj) = @_;
… …
978cf::attachable->attach ( 1069cf::attachable->attach (
979 prio => -1000000, 1070 prio => -1000000,
980 on_instantiate => sub { 1071 on_instantiate => sub {
981 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
982 1073
983 $data = from_json $data; 1074 $data = decode_json $data;
984 1075
985 for (@$data) { 1076 for (@$data) {
986 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
987 1078
988 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1004sub object_freezer_save { 1095sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1006 1097
1007 sync_job { 1098 sync_job {
1008 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1011 1103
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1108 close $fh;
1017 1109
1018 if (@$objs) { 1110 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1116 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1118 }
… …
1034 } 1126 }
1035 } else { 1127 } else {
1036 aio_unlink $filename; 1128 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1038 } 1130 }
1039 } 1131 };
1040} 1132}
1041 1133
1042sub object_freezer_as_string { 1134sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1044 1136
… …
1056 or return; 1148 or return;
1057 1149
1058 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1152 or return;
1153
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1062 } 1156 }
1063 1157
1158 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1066 return ($data, $av); 1162 ($data, $av)
1067} 1163}
1068 1164
1069=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1070 1166
1071=over 4 1167=over 4
… …
1149 my ($type, $reply, @payload) = 1245 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1246 "ARRAY" eq ref $msg
1151 ? @$msg 1247 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1249
1250 my @reply;
1251
1154 if (my $cb = $EXTCMD{$type}) { 1252 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1253 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1160 } else { 1259 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1261 }
1163 1262
1164 cf::override; 1263 cf::override;
… …
1254 1353
1255=head3 cf::player 1354=head3 cf::player
1256 1355
1257=over 4 1356=over 4
1258 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1259=item cf::player::find $login 1372=item cf::player::find $login
1260 1373
1261Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1262 1375
1263=cut 1376=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1415
1303 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1306 } 1424 }
1307 } 1425 }
1308} 1426}
1309 1427
… …
1319 1437
1320 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1322 1440
1323 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1324 Coro::cede; 1442 cf::cede_to_tick;
1325} 1443}
1326 1444
1327sub new($) { 1445sub new($) {
1328 my ($login) = @_; 1446 my ($login) = @_;
1329 1447
… …
1407 or return []; 1525 or return [];
1408 1526
1409 my @logins; 1527 my @logins;
1410 1528
1411 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1415 1538
1416 utf8::decode $login; 1539 utf8::decode $login;
1417 push @logins, $login; 1540 push @logins, $login;
1418 } 1541 }
1419 1542
… …
1452 1575
1453Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1454 1577
1455=cut 1578=cut
1456 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1457sub expand_cfpod { 1591sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1459 1593
1460 # escape & and < 1594 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1595
1464 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1465 1599
1466 1 while 1600 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1605 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1473 $self->gender ? $2 : $1 1607 (?:
1474 }ge 1608 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1609 | < $interior >
1476 || s{H<([^\>]*)>} 1610 )
1611 >
1612 %gcsx
1477 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1633 "")
1481 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1483 1645
1646 for ($xml) {
1484 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1486 1649
1487 # compress some whitespace 1650 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1492 1656
1493 $_ 1657 $xml
1494} 1658}
1659
1660no re 'eval';
1495 1661
1496sub hintmode { 1662sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1664 $_[0]{hintmode}
1499} 1665}
… …
1505=cut 1671=cut
1506 1672
1507sub ext_reply($$@) { 1673sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1674 my ($self, $id, @msg) = @_;
1509 1675
1510 if ($self->ns->extcmd == 2) { 1676 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1677}
1518 1678
1519=item $player->ext_msg ($type, @msg) 1679=item $player->ext_msg ($type, @msg)
1520 1680
1521Sends an ext event to the client. 1681Sends an ext event to the client.
… …
1749 1909
1750sub load_header_from($) { 1910sub load_header_from($) {
1751 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1752 1912
1753 utf8::encode $path; 1913 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1759 1922
1760 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1761 1924
1762 1 1925 1
1763} 1926}
… …
1817sub find { 1980sub find {
1818 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1819 1982
1820 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1821 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1823 1987
1824 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1826 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1827 or return; 1993 or return;
1828 1994
1829 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1830 1996
… …
1832 or return; 1998 or return;
1833 1999
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1837 $map->reset; 2005 $map->reset;
1838 undef $guard;
1839 return find $path; 2006 return find $path;
1840 } 2007 }
1841 2008
1842 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1843 } 2010 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1853 2020
1854 my $path = $self->{path}; 2021 my $path = $self->{path};
1855 2022
1856 { 2023 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1858 2025
2026 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2028
1861 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1862 2030
1863 $self->alloc; 2031 $self->alloc;
1864 2032
1865 $self->pre_load; 2033 $self->pre_load;
1866 Coro::cede; 2034 cf::cede_to_tick;
1867 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1869 or return; 2039 or return;
1870 2040
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1873 2043
1874 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2045 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2048 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1879 } 2052 }
1880 } 2053 }
1881 2054
1882 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1883 # now do the right thing for maps 2058 # now do the right thing for maps
1884 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2061 unless $self->difficulty;
1887 Coro::cede; 2062 cf::cede_to_tick;
1888 2063
1889 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2065 $self->decay_objects;
1891 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1892 $self->update_buttons; 2067 $self->update_buttons;
1893 Coro::cede; 2068 cf::cede_to_tick;
1894 $self->set_darkness_map; 2069 $self->set_darkness_map;
1895 Coro::cede; 2070 cf::cede_to_tick;
1896 $self->activate; 2071 $self->activate;
1897 } 2072 }
1898 2073
1899 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
… …
1916 2091
1917 $self 2092 $self
1918} 2093}
1919 2094
1920# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2096sub load_neighbours {
1922 my ($map) = @_; 2097 my ($map) = @_;
1923 2098
1924 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1925 2100
1926 for (0 .. 3) { 2101 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1928 or next; 2103 or next;
1929 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1930 or next; 2105 or next;
1931 $neigh->load; 2106 $neigh->load;
1932 2107
2108 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2111 }
1936 2112
1937 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1939 or next; 2116 or next;
1940 $neigh->load; 2117 $neigh->load;
1941 } 2118 }
1942} 2119}
1943 2120
… …
1948} 2125}
1949 2126
1950sub do_load_sync { 2127sub do_load_sync {
1951 my ($map) = @_; 2128 my ($map) = @_;
1952 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1953 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1954} 2134}
1955 2135
1956our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1958 2138
1959sub find_async { 2139sub find_async {
1960 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1961 2141
1962 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1963 2143
1964 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2146 }
1967 2147
1968 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1969 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1970 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2155 if (my $map = find $k) {
1973 $map->load; 2156 $map->load if $v;
1974 } 2157 }
1975 2158
1976 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1977 } 2160 }
1978 } 2161 }
1979 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1980 }; 2163 };
1981 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
… …
1984} 2167}
1985 2168
1986sub save { 2169sub save {
1987 my ($self) = @_; 2170 my ($self) = @_;
1988 2171
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2173
1991 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1992 2175
1993 return unless $self->dirty; 2176 return unless $self->dirty;
1994 2177
… …
2000 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2001 2184
2002 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2003 2186
2004 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2006 }; 2190 };
2007 2191
2008 if ($uniq) { 2192 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2017 my ($self) = @_; 2201 my ($self) = @_;
2018 2202
2019 # save first because save cedes 2203 # save first because save cedes
2020 $self->save; 2204 $self->save;
2021 2205
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2207
2024 return if $self->players; 2208 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2027 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2216 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2217}
2031 2218
2032sub reset_at { 2219sub reset_at {
2033 my ($self) = @_; 2220 my ($self) = @_;
2034 2221
… …
2066 if $uniq; 2253 if $uniq;
2067 } 2254 }
2068 2255
2069 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2070 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2260 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2261
2075 $self->unlink_save; 2262 $self->unlink_save;
2076 $self->destroy; 2263 $self->destroy;
2077} 2264}
2078 2265
2079my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2080 2267
2081sub nuke { 2268sub nuke {
2082 my ($self) = @_; 2269 my ($self) = @_;
2083 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2084 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2085 2275
2086 $self->unlink_save; 2276 $self->unlink_save;
2087 2277
2088 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2283
2094 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2095 2286
2096 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2097} 2288}
2098 2289
2099=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
… …
2175 2366
2176sub inv_recursive { 2367sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2178} 2369}
2179 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2180package cf; 2399package cf;
2181 2400
2182=back 2401=back
2183 2402
2184=head3 cf::object::player 2403=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2315 2534
2316 $map->load; 2535 $map->load;
2317 $map->load_diag; 2536 $map->load_neighbours;
2318 2537
2319 return unless $self->contr->active; 2538 return unless $self->contr->active;
2320 $self->activate_recursive; 2539 $self->activate_recursive;
2321 2540
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2562
2344 $self->enter_link; 2563 $self->enter_link;
2345 2564
2346 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2347 my $map = eval { 2587 my $map = eval {
2348 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2349 2589
2350 if ($map) { 2590 if ($map) {
2351 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2353 } else { 2593 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2595 }
2356 2596
2357 $map 2597 $map
2358 }; 2598 };
2359 2599
… …
2412 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2413 } 2653 }
2414 2654
2415 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2416 2656
2417 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2418 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2420 2660
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
… …
2449 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2452 2692
2453 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2454 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2455 unless (eval { 2697 unless (eval {
2456 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2457 2699
2458 1; 2700 1;
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2495 2737
2496=cut 2738=cut
2497 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2498sub cf::client::send_msg { 2792sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2794
2501 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2502 2796
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2505 if (ref $channel) { 2808 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2510 } 2814 }
2511 2815
2512 $channel = $channel->{id}; 2816 $channel = $channel->{id};
2513 } 2817 }
2514 2818
… …
2555=cut 2859=cut
2556 2860
2557sub cf::client::ext_msg($$@) { 2861sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2862 my ($self, $type, @msg) = @_;
2559 2863
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2864 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2866 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2867 push @msg, msgtype => "event_$type";
2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2887 }
2568} 2888}
2569 2889
2570=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2952 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2953 "ARRAY" eq ref $msg
2634 ? @$msg 2954 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2956
2957 my @reply;
2958
2637 if (my $cb = $EXTICMD{$type}) { 2959 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2960 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2643 } else { 2966 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2968 }
2646 2969
2647 cf::override; 2970 cf::override;
… …
2707=pod 3030=pod
2708 3031
2709The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2710 3033
2711 cf::object 3034 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3036 insert remove name archname title slaying race decrease_ob_nr
2714 3037
2715 cf::object::player 3038 cf::object::player
2716 player 3039 player
2717 3040
2718 cf::player 3041 cf::player
… …
2723 3046
2724=cut 3047=cut
2725 3048
2726for ( 3049for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3051 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)],
2729 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2732) { 3056) {
2733 no strict 'refs'; 3057 no strict 'refs';
… …
2809# the server's init and main functions 3133# the server's init and main functions
2810 3134
2811sub load_facedata($) { 3135sub load_facedata($) {
2812 my ($path) = @_; 3136 my ($path) = @_;
2813 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143
2814 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2815 3145
2816 my $facedata; 3146 my $facedata;
2817 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3148 or die "$path: $!";
… …
2820 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2821 3151
2822 $facedata->{version} == 2 3152 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3154
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick;
3161
2825 { 3162 {
2826 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2827 3164
2828 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2830 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3172
2835 cf::cede_to_tick; 3173 cf::cede_to_tick;
2836 } 3174 }
2837 3175
2838 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2840 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2841 or next; 3180 or next;
3181
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3185 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2863 3203
2864 { 3204 {
2865 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3208
2872 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3210 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
2879 3213
2880 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
2881 # prepend meta info 3215 # prepend meta info
2882 3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3223 } else {
3224 $data = $info->{data};
3225 }
2885 3226
2886 cf::face::set_data $idx, 0, $data, $chk; 3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
2887 } else { 3229 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3230 $RESOURCE{$name} = $info;
2889 } 3231 }
2890 3232
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3233 cf::cede_to_tick;
2894 } 3234 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3238
2915 1 3239 1
2916} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
2917 3261
2918register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
2920 3264
2921 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3266 $ns->fx_want ($k, $v);
2923 } 3267 }
2924}; 3268};
2925 3269
2926sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2927 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
2929 3277
2930 for (cf::region::list) { 3278 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3279 $_->{match} = qr/$_->{match}/
… …
2967 3315
2968sub init { 3316sub init {
2969 reload_resources; 3317 reload_resources;
2970} 3318}
2971 3319
2972sub cfg_load { 3320sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3322 or return;
2975 3323
2976 local $/; 3324 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
2978 3326
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3328
2981 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2982 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2993sub main { 3341sub main {
2994 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3345 (async {
2998 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3000 }; 3349 };
3001 3350
3002 cfg_load; 3351 reload_config;
3003 db_init; 3352 db_init;
3004 load_extensions; 3353 load_extensions;
3005 3354
3006 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3007 Event::loop; 3357 EV::loop;
3008} 3358}
3009 3359
3010############################################################################# 3360#############################################################################
3011# initialisation and cleanup 3361# initialisation and cleanup
3012 3362
3013# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3014BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
3023 },
3024 ); 3369 };
3025 } 3370 }
3026} 3371}
3027 3372
3028sub write_runtime { 3373sub write_runtime {
3029 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
… …
3074 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3425 $pl->save;
3080 } 3426 }
3081 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3082 3428
3083 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
… …
3122 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3470
3125 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3126 3472
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
3133 for (;;) { 3474 for (;;) {
3134 BDB::flush; 3475 BDB::flush;
3135 IO::AIO::flush; 3476 IO::AIO::flush;
3136 Coro::cede; 3477 Coro::cede_notself;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate..."; 3479 warn "iterate...";
3139 } 3480 }
3140 3481
3141 ++$RELOAD; 3482 ++$RELOAD;
… …
3200 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
3201 require cf; 3542 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3544
3204 warn "loading config and database again"; 3545 warn "loading config and database again";
3205 cf::cfg_load; 3546 cf::reload_config;
3206 3547
3207 warn "loading extensions"; 3548 warn "loading extensions";
3208 cf::load_extensions; 3549 cf::load_extensions;
3209 3550
3210 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
… …
3230 3571
3231sub reload_perl() { 3572sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3234 3575
3235 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3236 reentrant => 0,
3237 after => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => sub {
3240 do_reload_perl; 3577 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3242 },
3243 ); 3579 };
3244} 3580}
3245 3581
3246register_command "reload" => sub { 3582register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3248 3584
3249 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3589 reload_perl;
3590 };
3252 } 3591 }
3253}; 3592};
3254 3593
3255unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3256 3595
… …
3275 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3616 $signal->wait;
3278} 3617}
3279 3618
3280 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3292 return; 3623 return;
3293 } 3624 }
3294 3625
3295 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3296 3627
3297 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3298 3629
3299 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3300 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3301 my $t = Event::time;
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303 or die;
3304 3632
3305 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3307 $map->alloc; 3635 Coro::async_pool {
3308 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3309 my $t = Event::time - $t; 3637 write_runtime
3310 3638 or warn "ERROR: unable to write runtime file: $!";
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3639 };
3640 }
3321 3641
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3643 $sig->send;
3338 } 3644 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3646 $sig->send;
3341 } 3647 }
3342 3648
3343 $NOW = Event::time;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3651
3354 _post_tick; 3652 _post_tick;
3355 3653};
3356 3654$TICK_WATCHER->priority (EV::MAXPRI);
3357 },
3358);
3359 3655
3360{ 3656{
3361 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3658
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3371 3660 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3662
3387 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3669
3390 cf::sync_job { 3670 cf::sync_job {
3391 eval { 3671 eval {
3392 BDB::db_env_open 3672 BDB::db_env_open
3393 $DB_ENV, 3673 $DB_ENV,
… …
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3677 0666;
3398 3678
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3680 };
3404 3681
3405 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3683 };
3407 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3408} 3695}
3409 3696
3410{ 3697{
3698 # configure IO::AIO
3699
3411 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3703}
3424 3704
3425my $_log_backtrace; 3705my $_log_backtrace;
3426 3706
3427sub _log_backtrace { 3707sub _log_backtrace {
… …
3431 3711
3432 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3714 ++$_log_backtrace;
3435 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3436 my @bt = fork_call { 3718 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines