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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.400 by root, Mon Dec 17 06:36:34 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;
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 (); 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
… …
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 91our $RUNTIME;
92our $NOW;
91 93
92our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
96# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 100
… …
159 161
160The raw value load value from the last tick. 162The raw value load value from the last tick.
161 163
162=item %cf::CFG 164=item %cf::CFG
163 165
164Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 167from wherever your confdir points to.
166 168
167=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
168 170
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
213)) { 214)) {
214 no strict 'refs'; 215 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 217}
217 218
218$Event::DIED = sub { 219$EV::DIED = sub {
219 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
220}; 221};
221 222
222############################################################################# 223#############################################################################
223 224
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 248 $d
248 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
249} 250}
250 251
251=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
252 253
253Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
254 255
255=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
256 257
257Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
258 259
259=cut 260=cut
260 261
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 263
263sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
265 266
266=item cf::lock_wait $string 267=item cf::lock_wait $string
267 268
268Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
269 270
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
286 287
287=cut 288=cut
288 289
289our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
290 292
291sub lock_wait($) { 293sub lock_wait($) {
292 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
293 300
294 # wait for lock, if any 301 # wait for lock, if any
295 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 304 Coro::schedule;
… …
303 310
304 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
305 lock_wait $key; 312 lock_wait $key;
306 313
307 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
308 316
309 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
312 } 321 }
313} 322}
314 323
… …
326 }; 335 };
327 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
328 $guard 337 $guard
329} 338}
330 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
331=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
332 356
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
… …
344our @SLOT_QUEUE; 368our @SLOT_QUEUE;
345our $SLOT_QUEUE; 369our $SLOT_QUEUE;
346 370
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
349 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
350 376
351 while () { 377 while () {
352 next_job: 378 next_job:
353 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
… …
361 } 387 }
362 } 388 }
363 } 389 }
364 390
365 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 394 $signal->wait;
369 } else { 395 } else {
370 Coro::schedule; 396 Coro::schedule;
371 } 397 }
… …
394 420
395BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
396 422
397=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
398 424
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 428acceptable.
403 429
404If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
… …
410 436
411sub sync_job(&) { 437sub sync_job(&) {
412 my ($job) = @_; 438 my ($job) = @_;
413 439
414 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 441 my $time = EV::time;
416 442
417 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
419 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
420 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 449 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
423 451
424 my $busy = 1; 452 my $busy = 1;
425 my @res; 453 my @res;
426 454
427 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 457 @res = eval { $job->() };
429 warn $@ if $@; 458 warn $@ if $@;
430 undef $busy; 459 undef $busy;
431 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
432 461
433 while ($busy) { 462 while ($busy) {
434 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
435 } 467 }
468 }
436 469
437 $time = Event::time - $time; 470 $time = EV::time - $time;
438 471
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 474
442 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
… …
472=item fork_call { }, $args 505=item fork_call { }, $args
473 506
474Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
478 511
479=cut 512=cut
480 513
481sub fork_call(&@) { 514sub fork_call(&@) {
482 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
483 516
484 # we seemingly have to make a local copy of the whole thing, 517 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 518 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 519 # TODO: investigate and fix (likely this will be rather laborious)
487 520
488 my @res = Coro::Util::fork_eval { 521 my @res = Coro::Util::fork_eval {
489 reset_signals; 522 reset_signals;
490 &$cb 523 &$cb
491 }, @args; 524 }, @args;
… …
500=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
501 534
502Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
505=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
506 561
507our $DB; 562our $DB;
508 563
509sub db_init { 564sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 565 cf::sync_job {
514 eval { 566 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 567 };
524} 568}
525 569
526sub db_get($$) { 570sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
528 572
… …
632attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
634 678
635In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 681Deliantra).
638 682
639=over 4 683=over 4
640 684
641=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
642 686
… …
940 984
941=cut 985=cut
942 986
943############################################################################# 987#############################################################################
944# object support 988# object support
945#
946 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
947sub _can_merge { 1023sub _can_merge {
948 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
949 1025
950 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1027
954 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
955} 1030}
956 1031
957sub reattach { 1032sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1034 my ($obj) = @_;
… …
981cf::attachable->attach ( 1056cf::attachable->attach (
982 prio => -1000000, 1057 prio => -1000000,
983 on_instantiate => sub { 1058 on_instantiate => sub {
984 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
985 1060
986 $data = from_json $data; 1061 $data = decode_json $data;
987 1062
988 for (@$data) { 1063 for (@$data) {
989 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
990 1065
991 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
1007sub object_freezer_save { 1082sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1009 1084
1010 sync_job { 1085 sync_job {
1011 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1014 1090
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1095 close $fh;
1020 1096
1021 if (@$objs) { 1097 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1103 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1105 }
… …
1037 } 1113 }
1038 } else { 1114 } else {
1039 aio_unlink $filename; 1115 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1041 } 1117 }
1042 } 1118 };
1043} 1119}
1044 1120
1045sub object_freezer_as_string { 1121sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1047 1123
… …
1059 or return; 1135 or return;
1060 1136
1061 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1139 or return;
1140
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1065 } 1143 }
1066 1144
1145 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1069 return ($data, $av); 1149 ($data, $av)
1070} 1150}
1071 1151
1072=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1073 1153
1074=over 4 1154=over 4
… …
1260 1340
1261=head3 cf::player 1341=head3 cf::player
1262 1342
1263=over 4 1343=over 4
1264 1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1358
1265=item cf::player::find $login 1359=item cf::player::find $login
1266 1360
1267Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1268 1362
1269=cut 1363=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1402
1309 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1312 } 1411 }
1313 } 1412 }
1314} 1413}
1315 1414
… …
1413 or return []; 1512 or return [];
1414 1513
1415 my @logins; 1514 my @logins;
1416 1515
1417 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1421 1525
1422 utf8::decode $login; 1526 utf8::decode $login;
1423 push @logins, $login; 1527 push @logins, $login;
1424 } 1528 }
1425 1529
… …
1458 1562
1459Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1460 1564
1461=cut 1565=cut
1462 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1463sub expand_cfpod { 1578sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1465 1580
1466 # escape & and < 1581 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1582
1470 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1471 1586
1472 1 while 1587 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1477 # replace G<male|female> tags 1592 ([BCGHITU])
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1593 <
1479 $self->gender ? $2 : $1 1594 (?:
1480 }ge 1595 ([^<>]*) (?{ $group = $^N })
1481 # replace H<hint text> 1596 | < $interior >
1482 || s{H<([^\>]*)>} 1597 )
1598 >
1599 %gcsx
1483 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1620 "")
1487 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1488 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1489 1632
1633 for ($xml) {
1490 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1492 1636
1493 # compress some whitespace 1637 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1498 1643
1499 $_ 1644 $xml
1500} 1645}
1646
1647no re 'eval';
1501 1648
1502sub hintmode { 1649sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1651 $_[0]{hintmode}
1505} 1652}
… …
1749 1896
1750sub load_header_from($) { 1897sub load_header_from($) {
1751 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1752 1899
1753 utf8::encode $path; 1900 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1759 1909
1760 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1761 1911
1762 1 1912 1
1763} 1913}
… …
1817sub find { 1967sub find {
1818 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1819 1969
1820 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1821 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1823 1974
1824 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1826 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1827 or return; 1980 or return;
1828 1981
1829 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1830 1983
… …
1832 or return; 1985 or return;
1833 1986
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1837 $map->reset; 1992 $map->reset;
1838 undef $guard;
1839 return find $path; 1993 return find $path;
1840 } 1994 }
1841 1995
1842 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1843 } 1997 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1853 2007
1854 my $path = $self->{path}; 2008 my $path = $self->{path};
1855 2009
1856 { 2010 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2012
2013 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2015
1862 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1863 2017
1864 $self->alloc; 2018 $self->alloc;
1865 2019
1866 $self->pre_load; 2020 $self->pre_load;
1867 cf::cede_to_tick; 2021 cf::cede_to_tick;
1868 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1870 or return; 2026 or return;
1871 2027
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1874 2030
1875 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2032 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2035 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1880 } 2039 }
1881 } 2040 }
2041
2042 $f->resolve_delayed_derefs;
1882 2043
1883 cf::cede_to_tick; 2044 cf::cede_to_tick;
1884 # now do the right thing for maps 2045 # now do the right thing for maps
1885 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2133 }
1973 2134
1974 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
1975 2136
1976 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1977 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2142 if (my $map = find $k) {
1980 $map->load if $v; 2143 $map->load if $v;
1981 } 2144 }
… …
2007 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2008 2171
2009 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2010 2173
2011 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2013 }; 2177 };
2014 2178
2015 if ($uniq) { 2179 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2194
2031 return if $self->players; 2195 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2197 return if $self->{deny_save};
2034 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2203 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2204}
2038 2205
2039sub reset_at { 2206sub reset_at {
2040 my ($self) = @_; 2207 my ($self) = @_;
2041 2208
… …
2073 if $uniq; 2240 if $uniq;
2074 } 2241 }
2075 2242
2076 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2077 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2247 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2248
2082 $self->unlink_save; 2249 $self->unlink_save;
2083 $self->destroy; 2250 $self->destroy;
2084} 2251}
2085 2252
… …
2090 2257
2091 { 2258 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2260
2094 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
2262
2263 $self->unlink_save;
2095 2264
2096 bless $self, "cf::map"; 2265 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2270
2104 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2105 } 2272 }
2106 2273
2107 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
… …
2186 2353
2187sub inv_recursive { 2354sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2189} 2356}
2190 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
2191package cf; 2386package cf;
2192 2387
2193=back 2388=back
2194 2389
2195=head3 cf::object::player 2390=head3 cf::object::player
… …
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2549
2355 $self->enter_link; 2550 $self->enter_link;
2356 2551
2357 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2358 my $map = eval { 2574 my $map = eval {
2359 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2360 2576
2361 if ($map) { 2577 if ($map) {
2362 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2364 } else { 2580 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2582 }
2367 2583
2368 $map 2584 $map
2369 }; 2585 };
2370 2586
… …
2423 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2424 } 2640 }
2425 2641
2426 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2427 2643
2428 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2429 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2431 2647
2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2433 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2460 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2463 2679
2464 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2465 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2684 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2468 2686
2469 1; 2687 1;
… …
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2506 2724
2507=cut 2725=cut
2508 2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2509sub cf::client::send_msg { 2779sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2781
2512 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2513 2783
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515 2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2516 if (ref $channel) { 2795 } elsif (ref $channel) {
2517 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2521 } 2801 }
2522 2802
2523 $channel = $channel->{id}; 2803 $channel = $channel->{id};
2524 } 2804 }
2525 2805
… …
2737=pod 3017=pod
2738 3018
2739The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2740 3020
2741 cf::object 3021 cf::object
2742 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2743 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2744 3024
2745 cf::object::player 3025 cf::object::player
2746 player 3026 player
2747 3027
… …
2754=cut 3034=cut
2755 3035
2756for ( 3036for (
2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2759 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2760 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2761 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2762 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2763) { 3043) {
2764 no strict 'refs'; 3044 no strict 'refs';
… …
3039sub main { 3319sub main {
3040 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3041 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async { 3323 (async {
3044 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3045 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3046 }; 3327 };
3047 3328
3048 reload_config; 3329 reload_config;
3049 db_init; 3330 db_init;
3050 load_extensions; 3331 load_extensions;
3051 3332
3052 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3053 Event::loop; 3335 EV::loop;
3054} 3336}
3055 3337
3056############################################################################# 3338#############################################################################
3057# initialisation and cleanup 3339# initialisation and cleanup
3058 3340
3059# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3060BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3061 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3062 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3063 reentrant => 0,
3064 data => WF_AUTOCANCEL,
3065 signal => $signal,
3066 prio => 0,
3067 cb => sub {
3068 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3069 },
3070 ); 3347 };
3071 } 3348 }
3072} 3349}
3073 3350
3074sub write_runtime { 3351sub write_runtime {
3075 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
… …
3120 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3121 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3122 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3123 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3124 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3125 $pl->save; 3403 $pl->save;
3126 } 3404 }
3127 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3128 3406
3129 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
… …
3168 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3169 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3170 3448
3171 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3172 3450
3173 warn "cancelling all WF_AUTOCANCEL watchers";
3174 for (Event::all_watchers) {
3175 $_->cancel if $_->data & WF_AUTOCANCEL;
3176 }
3177
3178 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3179 for (;;) { 3452 for (;;) {
3180 BDB::flush; 3453 BDB::flush;
3181 IO::AIO::flush; 3454 IO::AIO::flush;
3182 Coro::cede; 3455 Coro::cede_notself;
3183 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3184 warn "iterate..."; 3457 warn "iterate...";
3185 } 3458 }
3186 3459
3187 ++$RELOAD; 3460 ++$RELOAD;
… …
3276 3549
3277sub reload_perl() { 3550sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3280 3553
3281 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3282 reentrant => 0,
3283 after => 0,
3284 data => WF_AUTOCANCEL,
3285 cb => sub {
3286 do_reload_perl;
3287 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3288 }, 3556 do_reload_perl;
3289 ); 3557 };
3290} 3558}
3291 3559
3292register_command "reload" => sub { 3560register_command "reload" => sub {
3293 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3294 3562
3295 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3296 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3297 async { reload_perl }; 3567 reload_perl;
3568 };
3298 } 3569 }
3299}; 3570};
3300 3571
3301unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3302 3573
… …
3321 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3594 $signal->wait;
3324} 3595}
3325 3596
3326 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer (
3329 reentrant => 0,
3330 parked => 1,
3331 prio => 0,
3332 at => $NEXT_TICK || $TICK,
3333 data => WF_AUTOCANCEL,
3334 cb => sub {
3335 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3337 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3338 return; 3601 return;
3339 } 3602 }
3340 3603
3341 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3342 3605
3343 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3344 3607
3345 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3346 for(1..10) { 3609 $NEXT_TICK += $TICK;
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350 3610
3351 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3352 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
3353 $map->alloc; 3613 Coro::async_pool {
3354 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3355 my $t = Event::time - $t; 3615 write_runtime
3356 3616 or warn "ERROR: unable to write runtime file: $!";
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 }; 3617 };
3618 }
3367 3619
3368 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK;
3370
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool {
3374 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!";
3376 };
3377 }
3378
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3621 $sig->send;
3384 } 3622 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3624 $sig->send;
3387 } 3625 }
3388 3626
3389 $NOW = Event::time;
3390
3391 # if we are delayed by four ticks or more, skip them all
3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3393
3394 $TICK_WATCHER->at ($NEXT_TICK);
3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3629
3400 _post_tick; 3630 _post_tick;
3401 3631};
3402 3632$TICK_WATCHER->priority (EV::MAXPRI);
3403 },
3404);
3405 3633
3406{ 3634{
3407 BDB::max_poll_time $TICK * 0.1;
3408 $BDB_POLL_WATCHER = Event->io (
3409 reentrant => 0,
3410 fd => BDB::poll_fileno,
3411 poll => 'r',
3412 prio => 0,
3413 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb,
3415 );
3416 BDB::min_parallel 8; 3635 BDB::min_parallel 8;
3417 3636 BDB::max_poll_reqs $TICK * 0.1;
3418 BDB::set_sync_prepare {
3419 my $status;
3420 my $current = $Coro::current;
3421 (
3422 sub {
3423 $status = $!;
3424 $current->ready; undef $current;
3425 },
3426 sub {
3427 Coro::schedule while defined $current;
3428 $! = $status;
3429 },
3430 )
3431 };
3432 3637
3433 unless ($DB_ENV) { 3638 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 3639 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3641 | BDB::LOG_AUTOREMOVE, 1);
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 3644
3436 cf::sync_job { 3645 cf::sync_job {
3437 eval { 3646 eval {
3438 BDB::db_env_open 3647 BDB::db_env_open
3439 $DB_ENV, 3648 $DB_ENV,
… …
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3650 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3651 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 3652 0666;
3444 3653
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3654 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 3655 };
3450 3656
3451 cf::cleanup "db_env_open(db): $@" if $@; 3657 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 3658 };
3453 } 3659 }
3660
3661 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 };
3664 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3665 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3666 };
3667 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 };
3454} 3670}
3455 3671
3456{ 3672{
3457 IO::AIO::min_parallel 8; 3673 IO::AIO::min_parallel 8;
3458 3674
3459 undef $Coro::AIO::WATCHER; 3675 undef $Coro::AIO::WATCHER;
3460 IO::AIO::max_poll_time $TICK * 0.1; 3676 IO::AIO::max_poll_time $TICK * 0.1;
3461 $AIO_POLL_WATCHER = Event->io ( 3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3462 reentrant => 0,
3463 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno,
3465 poll => 'r',
3466 prio => 6,
3467 cb => \&IO::AIO::poll_cb,
3468 );
3469} 3678}
3470 3679
3471my $_log_backtrace; 3680my $_log_backtrace;
3472 3681
3473sub _log_backtrace { 3682sub _log_backtrace {
… …
3477 3686
3478 # limit the # of concurrent backtraces 3687 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) { 3688 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace; 3689 ++$_log_backtrace;
3481 async { 3690 async {
3691 $Coro::current->{desc} = "abt $msg";
3692
3482 my @bt = fork_call { 3693 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr; 3694 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3695 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3696 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!"; 3697 or die "addr2line: $!";

Diff Legend

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