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.356 by root, Tue Sep 4 05:43:21 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, %PLAYER_LOADING); # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # 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
… …
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) = @_;
… …
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 || {} });
… …
1005); 1080);
1006 1081
1007sub object_freezer_save { 1082sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1009 1084
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1085 sync_job {
1013 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1016 1090
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1095 close $fh;
1022 1096
1023 if (@$objs) { 1097 if (@$objs) {
1024 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) {
1025 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1103 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1105 }
… …
1040 } else { 1114 } else {
1041 aio_unlink $filename; 1115 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1043 } 1117 }
1044 }; 1118 };
1045
1046 undef $guard;
1047} 1119}
1048 1120
1049sub object_freezer_as_string { 1121sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1051 1123
… …
1056 1128
1057sub object_thawer_load { 1129sub object_thawer_load {
1058 my ($filename) = @_; 1130 my ($filename) = @_;
1059 1131
1060 my ($data, $av); 1132 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1133
1064 (aio_load $filename, $data) >= 0 1134 (aio_load $filename, $data) >= 0
1065 or return; 1135 or return;
1066 1136
1067 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1139 or return;
1070 1140
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1073 } 1143 }
1074 1144
1145 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1077 1148
1078 ($data, $av) 1149 ($data, $av)
1079} 1150}
1080 1151
1081=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
… …
1269 1340
1270=head3 cf::player 1341=head3 cf::player
1271 1342
1272=over 4 1343=over 4
1273 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
1274=item cf::player::find $login 1359=item cf::player::find $login
1275 1360
1276Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1277 1362
1278=cut 1363=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1402
1318 my $f = new_from_file cf::object::thawer path $login 1403 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1404 or return;
1320 1405
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1406 my $pl = cf::player::load_pl $f
1323 or return; 1407 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1408 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1409 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
… …
1478 1562
1479Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1480 1564
1481=cut 1565=cut
1482 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
1483sub expand_cfpod { 1578sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1485 1580
1486 # escape & and < 1581 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1582
1490 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1491 1586
1492 1 while 1587 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1498 # replace G<male|female> tags 1593 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1500 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1501 }ge 1596 | < $interior >
1502 # replace H<hint text> 1597 )
1503 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1504 { 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") {
1505 ("<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>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1620 "")
1508 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1510 1632
1633 for ($xml) {
1511 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1513 1636
1514 # compress some whitespace 1637 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1519 1643
1520 $_ 1644 $xml
1521} 1645}
1646
1647no re 'eval';
1522 1648
1523sub hintmode { 1649sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1651 $_[0]{hintmode}
1526} 1652}
… …
1841sub find { 1967sub find {
1842 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1843 1969
1844 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1845 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1847 1974
1848 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1849 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
1850 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1851 or return; 1980 or return;
1852 1981
1853 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1854 1983
… …
1856 or return; 1985 or return;
1857 1986
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1861 $map->reset; 1992 $map->reset;
1862 undef $guard;
1863 return find $path; 1993 return find $path;
1864 } 1994 }
1865 1995
1866 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1867 } 1997 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1877 2007
1878 my $path = $self->{path}; 2008 my $path = $self->{path};
1879 2009
1880 { 2010 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2012
2013 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2015
1886 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1887 2017
1888 $self->alloc; 2018 $self->alloc;
1889 2019
… …
2003 } 2133 }
2004 2134
2005 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2006 2136
2007 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2008 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2142 if (my $map = find $k) {
2011 $map->load if $v; 2143 $map->load if $v;
2012 } 2144 }
… …
2038 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2039 2171
2040 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2041 2173
2042 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2044 }; 2177 };
2045 2178
2046 if ($uniq) { 2179 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2061 2194
2062 return if $self->players; 2195 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2197 return if $self->{deny_save};
2065 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2203 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2204}
2069 2205
2070sub reset_at { 2206sub reset_at {
2071 my ($self) = @_; 2207 my ($self) = @_;
2072 2208
… …
2104 if $uniq; 2240 if $uniq;
2105 } 2241 }
2106 2242
2107 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2108 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2247 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2248
2113 $self->unlink_save; 2249 $self->unlink_save;
2114 $self->destroy; 2250 $self->destroy;
2115} 2251}
2116 2252
… …
2231=cut 2367=cut
2232 2368
2233sub deref { 2369sub deref {
2234 my ($ref) = @_; 2370 my ($ref) = @_;
2235 2371
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2373 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2375 or return;
2243 $pl->ob->uuid eq $uuid 2376 $pl->ob->uuid eq $uuid
2244 or return; 2377 or return;
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2549
2417 $self->enter_link; 2550 $self->enter_link;
2418 2551
2419 (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
2420 my $map = eval { 2574 my $map = eval {
2421 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2422 2576
2423 if ($map) { 2577 if ($map) {
2424 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2426 } else { 2580 } else {
2427 $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);
2428 } 2582 }
2429 2583
2430 $map 2584 $map
2431 }; 2585 };
2432 2586
… …
2485 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2486 } 2640 }
2487 2641
2488 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2489 2643
2490 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2491 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2493 2647
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2522 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2525 2679
2526 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2527 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2684 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2530 2686
2531 1; 2687 1;
… …
2566the 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
2567the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2568 2724
2569=cut 2725=cut
2570 2726
2727# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2728our %CHANNEL = (
2572 "c/identify" => { 2729 "c/identify" => {
2573 id => "identify", 2730 id => "infobox",
2574 title => "Identify", 2731 title => "Identify",
2575 reply => undef, 2732 reply => undef,
2576 tooltip => "Items recently identified", 2733 tooltip => "Items recently identified",
2577 }, 2734 },
2578 "c/examine" => { 2735 "c/examine" => {
2579 id => "examine", 2736 id => "infobox",
2580 title => "Examine", 2737 title => "Examine",
2581 reply => undef, 2738 reply => undef,
2582 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2583 }, 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 },
2584); 2777);
2585 2778
2586sub cf::client::send_msg { 2779sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2781
2589 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2590 2783
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2785
2593 # check predefined channels, for the benefit of C 2786 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2595 2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2596 if (ref $channel) { 2795 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2799 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2800 if $self->can_msg;
… …
2818=pod 3017=pod
2819 3018
2820The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2821 3020
2822 cf::object 3021 cf::object
2823 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
2824 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2825 3024
2826 cf::object::player 3025 cf::object::player
2827 player 3026 player
2828 3027
… …
2835=cut 3034=cut
2836 3035
2837for ( 3036for (
2838 ["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
2839 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2844) { 3043) {
2845 no strict 'refs'; 3044 no strict 'refs';
… …
3120sub main { 3319sub main {
3121 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3123 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#
3124 (async { 3323 (async {
3125 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3127 }; 3327 };
3128 3328
3129 reload_config; 3329 reload_config;
3130 db_init; 3330 db_init;
3131 load_extensions; 3331 load_extensions;
3132 3332
3133 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3134 Event::loop; 3335 EV::loop;
3135} 3336}
3136 3337
3137############################################################################# 3338#############################################################################
3138# initialisation and cleanup 3339# initialisation and cleanup
3139 3340
3140# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3141BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3150 },
3151 ); 3347 };
3152 } 3348 }
3153} 3349}
3154 3350
3155sub write_runtime { 3351sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
… …
3201 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3403 $pl->save;
3207 } 3404 }
3208 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3209 3406
3210 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
… …
3249 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3448
3252 # 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
3253 3450
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258
3259 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3260 for (;;) { 3452 for (;;) {
3261 BDB::flush; 3453 BDB::flush;
3262 IO::AIO::flush; 3454 IO::AIO::flush;
3263 Coro::cede; 3455 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3457 warn "iterate...";
3266 } 3458 }
3267 3459
3268 ++$RELOAD; 3460 ++$RELOAD;
… …
3357 3549
3358sub reload_perl() { 3550sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3361 3553
3362 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3369 }, 3556 do_reload_perl;
3370 ); 3557 };
3371} 3558}
3372 3559
3373register_command "reload" => sub { 3560register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3375 3562
3376 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3567 reload_perl;
3568 };
3379 } 3569 }
3380}; 3570};
3381 3571
3382unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3383 3573
… …
3402 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3594 $signal->wait;
3405} 3595}
3406 3596
3407 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3417 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"
3418 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3419 return; 3601 return;
3420 } 3602 }
3421 3603
3422 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3423 3605
3424 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3425 3607
3426 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3427 for(1..10) { 3609 $NEXT_TICK += $TICK;
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431 3610
3432 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3433 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
3434 $map->alloc; 3613 Coro::async_pool {
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3614 $Coro::current->{desc} = "runtime saver";
3436 my $t = Event::time - $t; 3615 write_runtime
3437 3616 or warn "ERROR: unable to write runtime file: $!";
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 }; 3617 };
3618 }
3448 3619
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3621 $sig->send;
3465 } 3622 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3624 $sig->send;
3468 } 3625 }
3469 3626
3470 $NOW = Event::time;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3629
3481 _post_tick; 3630 _post_tick;
3482 3631};
3483 3632$TICK_WATCHER->priority (EV::MAXPRI);
3484 },
3485);
3486 3633
3487{ 3634{
3488 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 3635 BDB::min_parallel 8;
3498 3636 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare {
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 3637
3514 unless ($DB_ENV) { 3638 unless ($DB_ENV) {
3515 $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);
3516 3644
3517 cf::sync_job { 3645 cf::sync_job {
3518 eval { 3646 eval {
3519 BDB::db_env_open 3647 BDB::db_env_open
3520 $DB_ENV, 3648 $DB_ENV,
… …
3522 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
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3651 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3652 0666;
3525 3653
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3654 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3655 };
3531 3656
3532 cf::cleanup "db_env_open(db): $@" if $@; 3657 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3658 };
3534 } 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 };
3535} 3670}
3536 3671
3537{ 3672{
3538 IO::AIO::min_parallel 8; 3673 IO::AIO::min_parallel 8;
3539 3674
3540 undef $Coro::AIO::WATCHER; 3675 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3676 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 3678}
3551 3679
3552my $_log_backtrace; 3680my $_log_backtrace;
3553 3681
3554sub _log_backtrace { 3682sub _log_backtrace {
… …
3558 3686
3559 # limit the # of concurrent backtraces 3687 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3688 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3689 ++$_log_backtrace;
3562 async { 3690 async {
3691 $Coro::current->{desc} = "abt $msg";
3692
3563 my @bt = fork_call { 3693 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3694 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3695 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 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 |"
3567 or die "addr2line: $!"; 3697 or die "addr2line: $!";

Diff Legend

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