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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 87our $DB_ENV;
86 88
87our %CFG; 89our %CFG;
88 90
89our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 92our $RUNTIME;
93our $NOW;
91 94
92our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
159 162
160The raw value load value from the last tick. 163The raw value load value from the last tick.
161 164
162=item %cf::CFG 165=item %cf::CFG
163 166
164Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 168from wherever your confdir points to.
166 169
167=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
168 171
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
213)) { 215)) {
214 no strict 'refs'; 216 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 218}
217 219
218$Event::DIED = sub { 220$EV::DIED = sub {
219 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
220}; 222};
221 223
222############################################################################# 224#############################################################################
223 225
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 249 $d
248 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
249} 251}
250 252
251=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
252 254
253Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
254 256
255=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
256 258
257Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
258 260
259=cut 261=cut
260 262
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 264
263sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
265 267
266=item cf::lock_wait $string 268=item cf::lock_wait $string
267 269
268Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
269 271
334 }; 336 };
335 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
336 $guard 338 $guard
337} 339}
338 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
339=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
340 357
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds 359This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede. 360of cpu time till the next tick. The slot is only valid till the next cede.
352our @SLOT_QUEUE; 369our @SLOT_QUEUE;
353our $SLOT_QUEUE; 370our $SLOT_QUEUE;
354 371
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
357 my $signal = new Coro::Signal; 376 my $signal = new Coro::Signal;
358 377
359 while () { 378 while () {
360 next_job: 379 next_job:
361 my $avail = cf::till_tick; 380 my $avail = cf::till_tick;
369 } 388 }
370 } 389 }
371 } 390 }
372 391
373 if (@SLOT_QUEUE) { 392 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 394 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 395 $signal->wait;
377 } else { 396 } else {
378 Coro::schedule; 397 Coro::schedule;
379 } 398 }
402 421
403BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
404 423
405=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
406 425
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 429acceptable.
411 430
412If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
418 437
419sub sync_job(&) { 438sub sync_job(&) {
420 my ($job) = @_; 439 my ($job) = @_;
421 440
422 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 442 my $time = EV::time;
424 443
425 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
427 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
428 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 450 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
431 452
432 my $busy = 1; 453 my $busy = 1;
433 my @res; 454 my @res;
434 455
435 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 458 @res = eval { $job->() };
437 warn $@ if $@; 459 warn $@ if $@;
438 undef $busy; 460 undef $busy;
439 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
440 462
441 while ($busy) { 463 while ($busy) {
442 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
443 } 468 }
469 }
444 470
445 $time = Event::time - $time; 471 $time = EV::time - $time;
446 472
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449 475
450 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
480=item fork_call { }, $args 506=item fork_call { }, $args
481 507
482Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
486 512
487=cut 513=cut
488 514
489sub fork_call(&@) { 515sub fork_call(&@) {
490 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
508=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
509 535
510Stores the given C<$value> in the family. It can currently store binary 536Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
513=cut 544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
557 };
558 cf::cleanup "db_open(db): $@" if $@;
559
560 $db
561}
514 562
515our $DB; 563our $DB;
516 564
517sub db_init { 565sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 566 cf::sync_job {
522 eval { 567 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 568 };
532} 569}
533 570
534sub db_get($$) { 571sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
536 573
640attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
642 679
643In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 682Deliantra).
646 683
647=over 4 684=over 4
648 685
649=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
650 687
932 } 969 }
933 970
934 0 971 0
935} 972}
936 973
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 975
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 977
941Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
942 979
948 985
949=cut 986=cut
950 987
951############################################################################# 988#############################################################################
952# object support 989# object support
953#
954 990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
955sub _can_merge { 1024sub _can_merge {
956 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
957 1026
958 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1028
962 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
963} 1031}
964 1032
965sub reattach { 1033sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1035 my ($obj) = @_;
989cf::attachable->attach ( 1057cf::attachable->attach (
990 prio => -1000000, 1058 prio => -1000000,
991 on_instantiate => sub { 1059 on_instantiate => sub {
992 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
993 1061
994 $data = from_json $data; 1062 $data = decode_json $data;
995 1063
996 for (@$data) { 1064 for (@$data) {
997 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
998 1066
999 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
1013); 1081);
1014 1082
1015sub object_freezer_save { 1083sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
1017 1085
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1086 sync_job {
1021 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
1024 1091
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1096 close $fh;
1030 1097
1031 if (@$objs) { 1098 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1104 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1106 }
1048 } else { 1115 } else {
1049 aio_unlink $filename; 1116 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1051 } 1118 }
1052 }; 1119 };
1053
1054 undef $guard;
1055} 1120}
1056 1121
1057sub object_freezer_as_string { 1122sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1059 1124
1064 1129
1065sub object_thawer_load { 1130sub object_thawer_load {
1066 my ($filename) = @_; 1131 my ($filename) = @_;
1067 1132
1068 my ($data, $av); 1133 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1134
1072 (aio_load $filename, $data) >= 0 1135 (aio_load $filename, $data) >= 0
1073 or return; 1136 or return;
1074 1137
1075 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1140 or return;
1078 1141
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1081 } 1144 }
1082 1145
1146 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1085 1149
1086 ($data, $av) 1150 ($data, $av)
1087} 1151}
1088 1152
1089=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1403
1340 my $f = new_from_file cf::object::thawer path $login 1404 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1405 or return;
1342 1406
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1407 my $pl = cf::player::load_pl $f
1345 or return; 1408 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1409 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1410 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1500 1563
1501Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1502 1565
1503=cut 1566=cut
1504 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1505sub expand_cfpod { 1579sub expand_cfpod {
1506 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1507 1581
1508 # escape & and < 1582 my $xml;
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511 1583
1512 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1513 1587
1514 1 while 1588 $group =~ s/&/&amp;/g;
1515 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1516 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1517 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1518 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1520 # replace G<male|female> tags 1594 <
1521 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1522 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1523 }ge 1597 | < $interior >
1524 # replace H<hint text> 1598 )
1525 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1526 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "") 1621 "")
1530 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1531 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1532 1633
1634 for ($xml) {
1533 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1535 1637
1536 # compress some whitespace 1638 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1541 1644
1542 $_ 1645 $xml
1543} 1646}
1647
1648no re 'eval';
1544 1649
1545sub hintmode { 1650sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode} 1652 $_[0]{hintmode}
1548} 1653}
2029 } 2134 }
2030 2135
2031 $MAP_PREFETCH{$path} |= $load; 2136 $MAP_PREFETCH{$path} |= $load;
2032 2137
2033 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
2034 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2143 if (my $map = find $k) {
2037 $map->load if $v; 2144 $map->load if $v;
2038 } 2145 }
2064 return if $self->{deny_save}; 2171 return if $self->{deny_save};
2065 2172
2066 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
2067 2174
2068 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
2070 }; 2178 };
2071 2179
2072 if ($uniq) { 2180 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2260=cut 2368=cut
2261 2369
2262sub deref { 2370sub deref {
2263 my ($ref) = @_; 2371 my ($ref) = @_;
2264 2372
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2374 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2376 or return;
2272 $pl->ob->uuid eq $uuid 2377 $pl->ob->uuid eq $uuid
2273 or return; 2378 or return;
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2550
2446 $self->enter_link; 2551 $self->enter_link;
2447 2552
2448 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
2449 my $map = eval { 2575 my $map = eval {
2450 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2451 2577
2452 if ($map) { 2578 if ($map) {
2453 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2455 } else { 2581 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2583 }
2458 2584
2459 $map 2585 $map
2460 }; 2586 };
2461 2587
2514 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2515 } 2641 }
2516 2642
2517 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2518 2644
2519 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2520 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2522 2648
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2551 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2554 2680
2555 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2556 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2557 unless (eval { 2685 unless (eval {
2558 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2559 2687
2560 1; 2688 1;
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2597 2725
2598=cut 2726=cut
2599 2727
2728# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2729our %CHANNEL = (
2601 "c/identify" => { 2730 "c/identify" => {
2602 id => "identify", 2731 id => "infobox",
2603 title => "Identify", 2732 title => "Identify",
2604 reply => undef, 2733 reply => undef,
2605 tooltip => "Items recently identified", 2734 tooltip => "Items recently identified",
2606 }, 2735 },
2607 "c/examine" => { 2736 "c/examine" => {
2608 id => "examine", 2737 id => "infobox",
2609 title => "Examine", 2738 title => "Examine",
2610 reply => undef, 2739 reply => undef,
2611 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2612 }, 2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2613); 2778);
2614 2779
2615sub cf::client::send_msg { 2780sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2782
2618 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2619 2784
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2786
2622 # check predefined channels, for the benefit of C 2787 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2624 2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2625 if (ref $channel) { 2796 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2797 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2798 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2799 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2800 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2801 if $self->can_msg;
2847=pod 3018=pod
2848 3019
2849The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2850 3021
2851 cf::object 3022 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3023 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3024 insert remove name archname title slaying race decrease_ob_nr
2854 3025
2855 cf::object::player 3026 cf::object::player
2856 player 3027 player
2857 3028
2864=cut 3035=cut
2865 3036
2866for ( 3037for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3039 insert remove inv name archname title slaying race
2869 decrease_ob_nr)], 3040 decrease_ob_nr destroy)],
2870 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2873) { 3044) {
2874 no strict 'refs'; 3045 no strict 'refs';
2979 { 3150 {
2980 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2981 3152
2982 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2984 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988 3160
2989 cf::cede_to_tick; 3161 cf::cede_to_tick;
2990 } 3162 }
2991 3163
2992 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2994 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2995 or next; 3168 or next;
3169
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3173 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
3018 { 3192 {
3019 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3022 3196
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data; 3200 my $data;
3028 3201
3029 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3030 # prepend meta info 3203 # prepend meta info
3031 3204
3032 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3033 name => $name, 3206 name => $name,
3034 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3035 }); 3208 });
3036 3209
3037 $data = pack "(w/a*)*", $meta, $info->{data}; 3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3038 } else { 3217 } else {
3039 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3040 } 3219 }
3041 3220
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3221 cf::cede_to_tick;
3046 } 3222 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3226
3067 1 3227 1
3068} 3228}
3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3069 3249
3070register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3072 3252
3073 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
3149sub main { 3329sub main {
3150 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3333 (async {
3154 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3156 }; 3337 };
3157 3338
3158 reload_config; 3339 reload_config;
3159 db_init; 3340 db_init;
3160 load_extensions; 3341 load_extensions;
3161 3342
3162 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3163 Event::loop; 3345 EV::loop;
3164} 3346}
3165 3347
3166############################################################################# 3348#############################################################################
3167# initialisation and cleanup 3349# initialisation and cleanup
3168 3350
3169# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3170BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3179 },
3180 ); 3357 };
3181 } 3358 }
3182} 3359}
3183 3360
3184sub write_runtime { 3361sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
3230 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3413 $pl->save;
3236 } 3414 }
3237 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
3238 3416
3239 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
3278 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3458
3281 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
3282 3460
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3289 for (;;) { 3462 for (;;) {
3290 BDB::flush; 3463 BDB::flush;
3291 IO::AIO::flush; 3464 IO::AIO::flush;
3292 Coro::cede; 3465 Coro::cede_notself;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate..."; 3467 warn "iterate...";
3295 } 3468 }
3296 3469
3297 ++$RELOAD; 3470 ++$RELOAD;
3386 3559
3387sub reload_perl() { 3560sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3390 3563
3391 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3398 }, 3566 do_reload_perl;
3399 ); 3567 };
3400} 3568}
3401 3569
3402register_command "reload" => sub { 3570register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3404 3572
3405 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3577 reload_perl;
3578 };
3408 } 3579 }
3409}; 3580};
3410 3581
3411unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3412 3583
3431 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3604 $signal->wait;
3434} 3605}
3435 3606
3436 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3448 return; 3611 return;
3449 } 3612 }
3450 3613
3451 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3452 3615
3453 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3454 3617
3455 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
3456 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460 3620
3461 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3463 $map->alloc; 3623 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3624 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 3625 write_runtime
3466 3626 or warn "ERROR: unable to write runtime file: $!";
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3627 };
3628 }
3477 3629
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3631 $sig->send;
3494 } 3632 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3634 $sig->send;
3497 } 3635 }
3498 3636
3499 $NOW = Event::time;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3639
3510 _post_tick; 3640 _post_tick;
3511 3641};
3512 3642$TICK_WATCHER->priority (EV::MAXPRI);
3513 },
3514);
3515 3643
3516{ 3644{
3517 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3646
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3527 3648 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 3650
3543 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1);
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3657
3546 cf::sync_job { 3658 cf::sync_job {
3547 eval { 3659 eval {
3548 BDB::db_env_open 3660 BDB::db_env_open
3549 $DB_ENV, 3661 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3663 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3665 0666;
3554 3666
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3668 };
3560 3669
3561 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3671 };
3563 } 3672 }
3673
3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3676 };
3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3679 };
3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3682 };
3564} 3683}
3565 3684
3566{ 3685{
3686 # configure IO::AIO
3687
3567 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3691}
3580 3692
3581my $_log_backtrace; 3693my $_log_backtrace;
3582 3694
3583sub _log_backtrace { 3695sub _log_backtrace {
3587 3699
3588 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3702 ++$_log_backtrace;
3591 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3592 my @bt = fork_call { 3706 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines