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.333 by root, Sun Aug 19 09:14:50 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines