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.369 by root, Thu Sep 13 08:35:25 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;
101our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 103our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 104our $DB_ENV;
88 105
89our %CFG; 106our %CFG;
90 107
91our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 109our $RUNTIME;
110our $NOW;
93 111
94our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
97 115
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 118
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
104 123
105binmode STDOUT; 124binmode STDOUT;
106binmode STDERR; 125binmode STDERR;
107 126
108# read virtual server time, if available 127# read virtual server time, if available
… …
161 180
162The raw value load value from the last tick. 181The raw value load value from the last tick.
163 182
164=item %cf::CFG 183=item %cf::CFG
165 184
166Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 186from wherever your confdir points to.
168 187
169=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
170 189
171These 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
… …
192 $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;
193 212
194 LOG llevError, $msg; 213 LOG llevError, $msg;
195 }; 214 };
196} 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#?
197 231
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
214)) { 248)) {
215 no strict 'refs'; 249 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 251}
218 252
219$Event::DIED = sub { 253$EV::DIED = sub {
220 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
221}; 255};
222 256
223############################################################################# 257#############################################################################
224 258
… …
247 $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;
248 $d 282 $d
249 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
250} 284}
251 285
252=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
253 287
254Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
255 289
256=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
257 291
258Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
259 293
260=cut 294=cut
261 295
262our $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
263 297
264sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
266 300
267=item cf::lock_wait $string 301=item cf::lock_wait $string
268 302
269Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
270 304
… …
326 360
327 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
328} 362}
329 363
330sub freeze_mainloop { 364sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
332 366
333 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 368}
335 }; 369
336 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
337 $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
338} 383}
339 384
340=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
341 386
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
353our @SLOT_QUEUE; 398our @SLOT_QUEUE;
354our $SLOT_QUEUE; 399our $SLOT_QUEUE;
355 400
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
358 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
359 406
360 while () { 407 while () {
361 next_job: 408 next_job:
362 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
… …
370 } 417 }
371 } 418 }
372 } 419 }
373 420
374 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 424 $signal->wait;
378 } else { 425 } else {
379 Coro::schedule; 426 Coro::schedule;
380 } 427 }
… …
403 450
404BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
405 452
406=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
407 454
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
410partly 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
411acceptable. 458acceptable.
412 459
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
… …
419 466
420sub sync_job(&) { 467sub sync_job(&) {
421 my ($job) = @_; 468 my ($job) = @_;
422 469
423 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 471 my $time = EV::time;
425 472
426 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
428 475
429 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 477
431 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
432 479
433 my $busy = 1; 480 my $busy = 1;
434 my @res; 481 my @res;
435 482
436 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 485 @res = eval { $job->() };
438 warn $@ if $@; 486 warn $@ if $@;
439 undef $busy; 487 undef $busy;
440 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
441 489
442 while ($busy) { 490 while ($busy) {
443 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
444 } 495 }
496 }
445 497
446 $time = Event::time - $time; 498 my $time = EV::time - $time;
447 499
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
452 501
453 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
454 } else { 503 } else {
455 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
456 505
… …
481=item fork_call { }, $args 530=item fork_call { }, $args
482 531
483Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
487 536
488=cut 537=cut
489 538
490sub fork_call(&@) { 539sub fork_call(&@) {
491 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
654 703
655In 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>
656C<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
657Crossfire TRT). 706Deliantra).
658 707
659=over 4 708=over 4
660 709
661=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
662 711
… …
944 } 993 }
945 994
946 0 995 0
947} 996}
948 997
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 999
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1001
953Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
954 1003
… …
960 1009
961=cut 1010=cut
962 1011
963############################################################################# 1012#############################################################################
964# object support 1013# object support
965#
966 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#
967sub _can_merge { 1048sub _can_merge {
968 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
969 1050
970 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1052
974 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
975} 1055}
976 1056
977sub reattach { 1057sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1059 my ($obj) = @_;
… …
1001cf::attachable->attach ( 1081cf::attachable->attach (
1002 prio => -1000000, 1082 prio => -1000000,
1003 on_instantiate => sub { 1083 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
1005 1085
1006 $data = from_json $data; 1086 $data = decode_json $data;
1007 1087
1008 for (@$data) { 1088 for (@$data) {
1009 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
1010 1090
1011 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1104 },
1025); 1105);
1026 1106
1027sub object_freezer_save { 1107sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1109
1032 sync_job { 1110 sync_job {
1033 if (length $$rdata) { 1111 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1112 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
… …
1042 close $fh; 1120 close $fh;
1043 1121
1044 if (@$objs) { 1122 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1128 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1130 }
… …
1061 } else { 1139 } else {
1062 aio_unlink $filename; 1140 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1064 } 1142 }
1065 }; 1143 };
1066
1067 undef $guard;
1068} 1144}
1069 1145
1070sub object_freezer_as_string { 1146sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1072 1148
… …
1077 1153
1078sub object_thawer_load { 1154sub object_thawer_load {
1079 my ($filename) = @_; 1155 my ($filename) = @_;
1080 1156
1081 my ($data, $av); 1157 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1158
1085 (aio_load $filename, $data) >= 0 1159 (aio_load $filename, $data) >= 0
1086 or return; 1160 or return;
1087 1161
1088 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1164 or return;
1091 1165
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1094 } 1168 }
1095 1169
1096 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1256 1330
1257 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1332 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1334 }
1262 1335
1263 warn $msg; 1336 warn $msg;
1264 } 1337 }
1265 1338
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1426
1354 my $f = new_from_file cf::object::thawer path $login 1427 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1428 or return;
1356 1429
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1430 my $pl = cf::player::load_pl $f
1359 or return; 1431 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1432 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1433 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
… …
1514 1586
1515Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1516 1588
1517=cut 1589=cut
1518 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
1519sub expand_cfpod { 1602sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1521 1604
1522 # escape & and < 1605 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1606
1526 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1527 1610
1528 1 while 1611 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1616 ([BCGHITU])
1534 # replace G<male|female> tags 1617 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1618 (?:
1536 $self->gender ? $2 : $1 1619 ([^<>]*) (?{ $group = $^N })
1537 }ge 1620 | < $interior >
1538 # replace H<hint text> 1621 )
1539 || s{H<([^\>]*)>} 1622 >
1623 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1644 "")
1544 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1546 1656
1657 for ($xml) {
1547 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1549 1660
1550 # compress some whitespace 1661 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1555 1667
1556 $_ 1668 $xml
1557} 1669}
1670
1671no re 'eval';
1558 1672
1559sub hintmode { 1673sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1675 $_[0]{hintmode}
1562} 1676}
… …
2043 } 2157 }
2044 2158
2045 $MAP_PREFETCH{$path} |= $load; 2159 $MAP_PREFETCH{$path} |= $load;
2046 2160
2047 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
2048 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2166 if (my $map = find $k) {
2051 $map->load if $v; 2167 $map->load if $v;
2052 } 2168 }
… …
2078 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2079 2195
2080 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2081 2197
2082 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2084 }; 2201 };
2085 2202
2086 if ($uniq) { 2203 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2391=cut
2275 2392
2276sub deref { 2393sub deref {
2277 my ($ref) = @_; 2394 my ($ref) = @_;
2278 2395
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2397 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2399 or return;
2286 $pl->ob->uuid eq $uuid 2400 $pl->ob->uuid eq $uuid
2287 or return; 2401 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2573
2460 $self->enter_link; 2574 $self->enter_link;
2461 2575
2462 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2463 # *tag paths override both path and x|y 2579 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2580 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2582 my $ob = $obs[rand @obs];
2467 2583
… …
2547 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2548 } 2664 }
2549 2665
2550 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2551 2667
2552 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2555 2671
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
… …
2584 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2587 2703
2588 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2589 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2708 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2592 2710
2593 1; 2711 1;
… …
2628the 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
2629the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2630 2748
2631=cut 2749=cut
2632 2750
2751# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2752our %CHANNEL = (
2634 "c/identify" => { 2753 "c/identify" => {
2635 id => "identify", 2754 id => "infobox",
2636 title => "Identify", 2755 title => "Identify",
2637 reply => undef, 2756 reply => undef,
2638 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2639 }, 2758 },
2640 "c/examine" => { 2759 "c/examine" => {
2641 id => "examine", 2760 id => "infobox",
2642 title => "Examine", 2761 title => "Examine",
2643 reply => undef, 2762 reply => undef,
2644 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2645 }, 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 },
2646); 2801);
2647 2802
2648sub cf::client::send_msg { 2803sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2805
2651 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2652 2807
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2809
2655 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2657 2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2658 if (ref $channel) { 2819 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2823 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2824 if $self->can_msg;
… …
2880=pod 3041=pod
2881 3042
2882The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2883 3044
2884 cf::object 3045 cf::object
2885 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
2886 insert remove name archname title slaying race decrease_ob_nr 3047 insert remove name archname title slaying race decrease_ob_nr
2887 3048
2888 cf::object::player 3049 cf::object::player
2889 player 3050 player
2890 3051
… …
2897=cut 3058=cut
2898 3059
2899for ( 3060for (
2900 ["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
2901 insert remove inv name archname title slaying race 3062 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3063 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2906) { 3067) {
2907 no strict 'refs'; 3068 no strict 'refs';
… …
3012 { 3173 {
3013 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
3014 3175
3015 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
3017 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
3019 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};
3020 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};
3021 3183
3022 cf::cede_to_tick; 3184 cf::cede_to_tick;
3023 } 3185 }
3024 3186
3025 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
3027 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
3028 or next; 3191 or next;
3192
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3196 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3051 { 3215 {
3052 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
3055 3219
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3223 my $data;
3061 3224
3062 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
3063 # prepend meta info 3226 # prepend meta info
3064 3227
3065 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
3066 name => $name, 3229 name => $name,
3067 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
3068 }); 3231 });
3069 3232
3070 $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};
3071 } else { 3240 } else {
3072 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
3073 } 3242 }
3074 3243
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3244 cf::cede_to_tick;
3079 } 3245 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3249
3100 1 3250 1
3101} 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});
3102 3272
3103register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
3105 3275
3106 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
… …
3161sub reload_config { 3331sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3333 or return;
3164 3334
3165 local $/; 3335 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3167 3337
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3339
3170 $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};
3171 $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};
… …
3182sub main { 3352sub main {
3183 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3185 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#
3186 (async { 3356 (async {
3187 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3189 }; 3360 };
3190 3361
3191 reload_config; 3362 reload_config;
3192 db_init; 3363 db_init;
3193 load_extensions; 3364 load_extensions;
3194 3365
3195 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
3196 Event::loop; 3368 EV::loop;
3197} 3369}
3198 3370
3199############################################################################# 3371#############################################################################
3200# initialisation and cleanup 3372# initialisation and cleanup
3201 3373
3202# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3203BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3212 },
3213 ); 3380 };
3214 } 3381 }
3215} 3382}
3216 3383
3217sub write_runtime { 3384sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
… …
3263 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3436 $pl->save;
3269 } 3437 }
3270 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3271 3439
3272 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
… …
3311 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3481
3314 # 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
3315 3483
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3322 for (;;) { 3485 for (;;) {
3323 BDB::flush; 3486 BDB::flush;
3324 IO::AIO::flush; 3487 IO::AIO::flush;
3325 Coro::cede; 3488 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3490 warn "iterate...";
3328 } 3491 }
3329 3492
3330 ++$RELOAD; 3493 ++$RELOAD;
… …
3406 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3407 3570
3408 1 3571 1
3409 } or do { 3572 } or do {
3410 warn $@; 3573 warn $@;
3411 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3575 };
3414 3576
3415 warn "reloaded"; 3577 warn "reloaded";
3416}; 3578};
3417 3579
… …
3419 3581
3420sub reload_perl() { 3582sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3423 3585
3424 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl; 3587 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3431 },
3432 ); 3589 };
3433} 3590}
3434 3591
3435register_command "reload" => sub { 3592register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3437 3594
3438 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3599 reload_perl;
3600 };
3441 } 3601 }
3442}; 3602};
3443 3603
3444unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3445 3605
… …
3447 3607
3448our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3450 3610
3451sub wait_for_tick { 3611sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3453 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3454 3614
3455 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3617 $signal->wait;
3458} 3618}
3459 3619
3460sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3462 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3463 3623
3464 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3626 $signal->wait;
3467} 3627}
3468 3628
3469our $stat_fh; 3629sub tick {
3470sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471
3472$TICK_WATCHER = Event->timer (
3473 reentrant => 0,
3474 parked => 1,
3475 prio => 0,
3476 at => $NEXT_TICK || $TICK,
3477 data => WF_AUTOCANCEL,
3478 cb => sub {
3479 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3480 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"
3481 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3482 return; 3633 return;
3483 } 3634 }
3484 3635
3485 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487 $NOW = $tick_start = Event::time;
3488
3489 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3490 3637
3491 $RUNTIME += $TICK;
3492 $NEXT_TICK += $TICK;
3493
3494 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3495 $NEXT_RUNTIME_WRITE = $NOW + 10; 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3496 Coro::async_pool { 3640 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver";
3497 write_runtime 3642 write_runtime
3498 or warn "ERROR: unable to write runtime file: $!"; 3643 or warn "ERROR: unable to write runtime file: $!";
3499 };
3500 } 3644 };
3645 }
3501 3646
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3648 $sig->send;
3507 } 3649 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3651 $sig->send;
3510 } 3652 }
3511 3653
3512 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3656
3523 _post_tick; 3657 if (0) {
3524 3658 if ($NEXT_TICK) {
3525 # gather some statistics#d# 3659 my $jitter = $TICK_START - $NEXT_TICK;
3526 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3527 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3661 warn "jitter $JITTER\n";#d#
3662 }
3528 }, 3663 }
3529); 3664}
3530 3665
3531{ 3666{
3667 # configure BDB
3668
3532 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3533 BDB::max_poll_time $TICK * 0.1; 3670 BDB::max_poll_reqs $TICK * 0.1;
3534 $BDB_POLL_WATCHER = Event->io ( 3671 $Coro::BDB::WATCHER->priority (1);
3535 reentrant => 0,
3536 fd => BDB::poll_fileno,
3537 poll => 'r',
3538 prio => 0,
3539 data => WF_AUTOCANCEL,
3540 cb => \&BDB::poll_cb,
3541 );
3542
3543 BDB::set_sync_prepare {
3544 my $status;
3545 my $current = $Coro::current;
3546 (
3547 sub {
3548 $status = $!;
3549 $current->ready; undef $current;
3550 },
3551 sub {
3552 Coro::schedule while defined $current;
3553 $! = $status;
3554 },
3555 )
3556 };
3557 3672
3558 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3679
3561 cf::sync_job { 3680 cf::sync_job {
3562 eval { 3681 eval {
3563 BDB::db_env_open 3682 BDB::db_env_open
3564 $DB_ENV, 3683 $DB_ENV,
… …
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 3687 0666;
3569 3688
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573 | BDB::LOG_AUTOREMOVE, 1);
3574 $DB_ENV->set_lk_detect;
3575 }; 3690 };
3576 3691
3577 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 3693 };
3579 } 3694 }
3580 3695
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3582 after => 11, 3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3583 interval => 60, 3698 };
3584 hard => 1, 3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3585 prio => 0,
3586 data => WF_AUTOCANCEL,
3587 cb => sub {
3588 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3589 },
3590 ); 3701 };
3591 $BDB_TRICKLE_WATCHER = Event->timer ( 3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3592 after => 5,
3593 interval => 10,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3599 },
3600 ); 3704 };
3601} 3705}
3602 3706
3603{ 3707{
3708 # configure IO::AIO
3709
3604 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3605
3606 undef $Coro::AIO::WATCHER;
3607 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3608 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3609 reentrant => 0,
3610 data => WF_AUTOCANCEL,
3611 fd => IO::AIO::poll_fileno,
3612 poll => 'r',
3613 prio => 6,
3614 cb => \&IO::AIO::poll_cb,
3615 );
3616} 3713}
3617 3714
3618my $_log_backtrace; 3715my $_log_backtrace;
3619 3716
3620sub _log_backtrace { 3717sub _log_backtrace {
… …
3624 3721
3625 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3626 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3627 ++$_log_backtrace; 3724 ++$_log_backtrace;
3628 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3629 my @bt = fork_call { 3728 my @bt = fork_call {
3630 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3631 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3632 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 |"
3633 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

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