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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 398our @SLOT_QUEUE;
355our $SLOT_QUEUE; 399our $SLOT_QUEUE;
356 400
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
359 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
360 406
361 while () { 407 while () {
362 next_job: 408 next_job:
363 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
371 } 417 }
372 } 418 }
373 } 419 }
374 420
375 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 424 $signal->wait;
379 } else { 425 } else {
380 Coro::schedule; 426 Coro::schedule;
381 } 427 }
404 450
405BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
406 452
407=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
408 454
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 458acceptable.
413 459
414If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
420 466
421sub sync_job(&) { 467sub sync_job(&) {
422 my ($job) = @_; 468 my ($job) = @_;
423 469
424 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 471 my $time = EV::time;
426 472
427 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
429 475
430 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 477
432 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
433 479
434 my $busy = 1; 480 my $busy = 1;
435 my @res; 481 my @res;
436 482
437 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 485 @res = eval { $job->() };
439 warn $@ if $@; 486 warn $@ if $@;
440 undef $busy; 487 undef $busy;
441 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
442 489
443 while ($busy) { 490 while ($busy) {
444 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
445 } 495 }
496 }
446 497
447 $time = Event::time - $time; 498 my $time = EV::time - $time;
448 499
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
453 501
454 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
455 } else { 503 } else {
456 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
457 505
482=item fork_call { }, $args 530=item fork_call { }, $args
483 531
484Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
488 536
489=cut 537=cut
490 538
491sub fork_call(&@) { 539sub fork_call(&@) {
492 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
653attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
655 703
656In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 706Deliantra).
659 707
660=over 4 708=over 4
661 709
662=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
663 711
945 } 993 }
946 994
947 0 995 0
948} 996}
949 997
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 999
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1001
954Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
955 1003
961 1009
962=cut 1010=cut
963 1011
964############################################################################# 1012#############################################################################
965# object support 1013# object support
966#
967 1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
968sub _can_merge { 1048sub _can_merge {
969 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
970 1050
971 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1052
975 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
976} 1055}
977 1056
978sub reattach { 1057sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1059 my ($obj) = @_;
1002cf::attachable->attach ( 1081cf::attachable->attach (
1003 prio => -1000000, 1082 prio => -1000000,
1004 on_instantiate => sub { 1083 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
1006 1085
1007 $data = from_json $data; 1086 $data = decode_json $data;
1008 1087
1009 for (@$data) { 1088 for (@$data) {
1010 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
1011 1090
1012 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1025 }, 1104 },
1026); 1105);
1027 1106
1028sub object_freezer_save { 1107sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1109
1033 sync_job { 1110 sync_job {
1034 if (length $$rdata) { 1111 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1112 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1043 close $fh; 1120 close $fh;
1044 1121
1045 if (@$objs) { 1122 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1128 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1130 }
1062 } else { 1139 } else {
1063 aio_unlink $filename; 1140 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1065 } 1142 }
1066 }; 1143 };
1067
1068 undef $guard;
1069} 1144}
1070 1145
1071sub object_freezer_as_string { 1146sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1073 1148
1078 1153
1079sub object_thawer_load { 1154sub object_thawer_load {
1080 my ($filename) = @_; 1155 my ($filename) = @_;
1081 1156
1082 my ($data, $av); 1157 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1158
1086 (aio_load $filename, $data) >= 0 1159 (aio_load $filename, $data) >= 0
1087 or return; 1160 or return;
1088 1161
1089 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1164 or return;
1092 1165
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1095 } 1168 }
1096 1169
1097 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1255 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1257 1330
1258 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1332 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1334 }
1263 1335
1264 warn $msg; 1336 warn $msg;
1265 } 1337 }
1266 1338
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1426
1355 my $f = new_from_file cf::object::thawer path $login 1427 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1428 or return;
1357 1429
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1430 my $pl = cf::player::load_pl $f
1360 or return; 1431 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1432 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1433 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1515 1586
1516Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1517 1588
1518=cut 1589=cut
1519 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1520sub expand_cfpod { 1602sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1522 1604
1523 # escape & and < 1605 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1606
1527 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1528 1610
1529 1 while 1611 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1616 ([BCGHITU])
1535 # replace G<male|female> tags 1617 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1618 (?:
1537 $self->gender ? $2 : $1 1619 ([^<>]*) (?{ $group = $^N })
1538 }ge 1620 | < $interior >
1539 # replace H<hint text> 1621 )
1540 || s{H<([^\>]*)>} 1622 >
1623 %gcsx
1541 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1644 "")
1545 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1547 1656
1657 for ($xml) {
1548 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1550 1660
1551 # compress some whitespace 1661 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1556 1667
1557 $_ 1668 $xml
1558} 1669}
1670
1671no re 'eval';
1559 1672
1560sub hintmode { 1673sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1675 $_[0]{hintmode}
1563} 1676}
2044 } 2157 }
2045 2158
2046 $MAP_PREFETCH{$path} |= $load; 2159 $MAP_PREFETCH{$path} |= $load;
2047 2160
2048 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
2049 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2166 if (my $map = find $k) {
2052 $map->load if $v; 2167 $map->load if $v;
2053 } 2168 }
2079 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2080 2195
2081 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2082 2197
2083 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2085 }; 2201 };
2086 2202
2087 if ($uniq) { 2203 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2275=cut 2391=cut
2276 2392
2277sub deref { 2393sub deref {
2278 my ($ref) = @_; 2394 my ($ref) = @_;
2279 2395
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2397 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2399 or return;
2287 $pl->ob->uuid eq $uuid 2400 $pl->ob->uuid eq $uuid
2288 or return; 2401 or return;
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2573
2461 $self->enter_link; 2574 $self->enter_link;
2462 2575
2463 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2464 # *tag paths override both path and x|y 2579 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2580 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2582 my $ob = $obs[rand @obs];
2468 2583
2548 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2549 } 2664 }
2550 2665
2551 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2552 2667
2553 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2556 2671
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2585 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2588 2703
2589 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2590 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2708 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2593 2710
2594 1; 2711 1;
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2631 2748
2632=cut 2749=cut
2633 2750
2751# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2752our %CHANNEL = (
2635 "c/identify" => { 2753 "c/identify" => {
2636 id => "identify", 2754 id => "infobox",
2637 title => "Identify", 2755 title => "Identify",
2638 reply => undef, 2756 reply => undef,
2639 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2640 }, 2758 },
2641 "c/examine" => { 2759 "c/examine" => {
2642 id => "examine", 2760 id => "infobox",
2643 title => "Examine", 2761 title => "Examine",
2644 reply => undef, 2762 reply => undef,
2645 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2646 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2647); 2801);
2648 2802
2649sub cf::client::send_msg { 2803sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2805
2652 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2653 2807
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2809
2656 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2658 2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2659 if (ref $channel) { 2819 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2823 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2824 if $self->can_msg;
2881=pod 3041=pod
2882 3042
2883The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2884 3044
2885 cf::object 3045 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3047 insert remove name archname title slaying race decrease_ob_nr
2888 3048
2889 cf::object::player 3049 cf::object::player
2890 player 3050 player
2891 3051
2898=cut 3058=cut
2899 3059
2900for ( 3060for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3062 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 3063 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2907) { 3067) {
2908 no strict 'refs'; 3068 no strict 'refs';
3013 { 3173 {
3014 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
3015 3175
3016 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
3018 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3022 3183
3023 cf::cede_to_tick; 3184 cf::cede_to_tick;
3024 } 3185 }
3025 3186
3026 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
3028 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
3029 or next; 3191 or next;
3192
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3196 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
3052 { 3215 {
3053 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
3056 3219
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3223 my $data;
3062 3224
3063 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
3064 # prepend meta info 3226 # prepend meta info
3065 3227
3066 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
3067 name => $name, 3229 name => $name,
3068 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
3069 }); 3231 });
3070 3232
3071 $data = pack "(w/a*)*", $meta, $info->{data}; 3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3072 } else { 3240 } else {
3073 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
3074 } 3242 }
3075 3243
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3244 cf::cede_to_tick;
3080 } 3245 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3249
3101 1 3250 1
3102} 3251}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3103 3272
3104register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
3106 3275
3107 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
3162sub reload_config { 3331sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3333 or return;
3165 3334
3166 local $/; 3335 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3168 3337
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3339
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3183sub main { 3352sub main {
3184 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3356 (async {
3188 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3190 }; 3360 };
3191 3361
3192 reload_config; 3362 reload_config;
3193 db_init; 3363 db_init;
3194 load_extensions; 3364 load_extensions;
3195 3365
3196 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
3197 Event::loop; 3368 EV::loop;
3198} 3369}
3199 3370
3200############################################################################# 3371#############################################################################
3201# initialisation and cleanup 3372# initialisation and cleanup
3202 3373
3203# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3204BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3213 },
3214 ); 3380 };
3215 } 3381 }
3216} 3382}
3217 3383
3218sub write_runtime { 3384sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3264 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3436 $pl->save;
3270 } 3437 }
3271 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3272 3439
3273 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3312 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3481
3315 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3316 3483
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3323 for (;;) { 3485 for (;;) {
3324 BDB::flush; 3486 BDB::flush;
3325 IO::AIO::flush; 3487 IO::AIO::flush;
3326 Coro::cede; 3488 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3490 warn "iterate...";
3329 } 3491 }
3330 3492
3331 ++$RELOAD; 3493 ++$RELOAD;
3407 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3408 3570
3409 1 3571 1
3410 } or do { 3572 } or do {
3411 warn $@; 3573 warn $@;
3412 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3575 };
3415 3576
3416 warn "reloaded"; 3577 warn "reloaded";
3417}; 3578};
3418 3579
3420 3581
3421sub reload_perl() { 3582sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3424 3585
3425 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl; 3587 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3432 },
3433 ); 3589 };
3434} 3590}
3435 3591
3436register_command "reload" => sub { 3592register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3438 3594
3439 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3599 reload_perl;
3600 };
3442 } 3601 }
3443}; 3602};
3444 3603
3445unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3446 3605
3448 3607
3449our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3451 3610
3452sub wait_for_tick { 3611sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3454 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3455 3614
3456 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3617 $signal->wait;
3459} 3618}
3460 3619
3461sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3463 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3464 3623
3465 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3626 $signal->wait;
3468} 3627}
3469 3628
3470$TICK_WATCHER = Event->timer ( 3629sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3480 return; 3633 return;
3481 } 3634 }
3482 3635
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3486 3637
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3640 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3642 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3643 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3644 };
3645 }
3497 3646
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3648 $sig->send;
3500 } 3649 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3651 $sig->send;
3503 } 3652 }
3504 3653
3505 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3656
3516 _post_tick; 3657 if (0) {
3658 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3517 }, 3663 }
3518); 3664}
3519 3665
3520{ 3666{
3667 # configure BDB
3668
3521 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3670 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3671 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3672
3547 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1); 3676 | BDB::LOG_AUTOREMOVE, 1);
3565 3691
3566 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3693 };
3568 } 3694 }
3569 3695
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 3698 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3701 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3704 };
3600} 3705}
3601 3706
3602{ 3707{
3708 # configure IO::AIO
3709
3603 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3713}
3616 3714
3617my $_log_backtrace; 3715my $_log_backtrace;
3618 3716
3619sub _log_backtrace { 3717sub _log_backtrace {
3623 3721
3624 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3724 ++$_log_backtrace;
3627 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3628 my @bt = fork_call { 3728 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines