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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines