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.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 2008 UTC

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

Diff Legend

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