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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.412 by root, Wed Apr 2 11:13:55 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 1.86;
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.32 ();
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 || {} });
… …
1041 close $fh; 1120 close $fh;
1042 1121
1043 if (@$objs) { 1122 if (@$objs) {
1044 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) {
1045 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1128 close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1130 }
… …
1082 1161
1083 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1164 or return;
1086 1165
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1088 } 1168 }
1089 1169
1090 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
… …
1248 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1250 1330
1251 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1332 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1334 }
1256 1335
1257 warn $msg; 1336 warn $msg;
1258 } 1337 }
1259 1338
… …
1507 1586
1508Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1509 1588
1510=cut 1589=cut
1511 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
1512sub expand_cfpod { 1602sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1514 1604
1515 # escape & and < 1605 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1606
1519 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1520 1610
1521 1 while 1611 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1616 ([BCGHITU])
1527 # replace G<male|female> tags 1617 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1618 (?:
1529 $self->gender ? $2 : $1 1619 ([^<>]*) (?{ $group = $^N })
1530 }ge 1620 | < $interior >
1531 # replace H<hint text> 1621 )
1532 || s{H<([^\>]*)>} 1622 >
1623 %gcsx
1533 { 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") {
1534 ("<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>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1644 "")
1537 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1539 1656
1657 for ($xml) {
1540 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1542 1660
1543 # compress some whitespace 1661 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1548 1667
1549 $_ 1668 $xml
1550} 1669}
1670
1671no re 'eval';
1551 1672
1552sub hintmode { 1673sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1675 $_[0]{hintmode}
1555} 1676}
… …
2036 } 2157 }
2037 2158
2038 $MAP_PREFETCH{$path} |= $load; 2159 $MAP_PREFETCH{$path} |= $load;
2039 2160
2040 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
2041 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2166 if (my $map = find $k) {
2044 $map->load if $v; 2167 $map->load if $v;
2045 } 2168 }
… …
2071 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2072 2195
2073 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2074 2197
2075 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2077 }; 2201 };
2078 2202
2079 if ($uniq) { 2203 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2267=cut 2391=cut
2268 2392
2269sub deref { 2393sub deref {
2270 my ($ref) = @_; 2394 my ($ref) = @_;
2271 2395
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2397 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2399 or return;
2279 $pl->ob->uuid eq $uuid 2400 $pl->ob->uuid eq $uuid
2280 or return; 2401 or return;
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2573
2453 $self->enter_link; 2574 $self->enter_link;
2454 2575
2455 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2456 # *tag paths override both path and x|y 2579 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2580 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2582 my $ob = $obs[rand @obs];
2460 2583
… …
2540 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2541 } 2664 }
2542 2665
2543 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2544 2667
2545 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2546 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2548 2671
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
… …
2577 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2580 2703
2581 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2582 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2708 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2585 2710
2586 1; 2711 1;
… …
2621the 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
2622the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2623 2748
2624=cut 2749=cut
2625 2750
2751# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2752our %CHANNEL = (
2627 "c/identify" => { 2753 "c/identify" => {
2628 id => "identify", 2754 id => "infobox",
2629 title => "Identify", 2755 title => "Identify",
2630 reply => undef, 2756 reply => undef,
2631 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2632 }, 2758 },
2633 "c/examine" => { 2759 "c/examine" => {
2634 id => "examine", 2760 id => "infobox",
2635 title => "Examine", 2761 title => "Examine",
2636 reply => undef, 2762 reply => undef,
2637 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2638 }, 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 },
2639); 2801);
2640 2802
2641sub cf::client::send_msg { 2803sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2805
2644 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2645 2807
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2809
2648 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2650 2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2651 if (ref $channel) { 2819 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2823 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2824 if $self->can_msg;
… …
2873=pod 3041=pod
2874 3042
2875The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2876 3044
2877 cf::object 3045 cf::object
2878 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
2879 insert remove name archname title slaying race decrease_ob_nr 3047 insert remove name archname title slaying race decrease_ob_nr
2880 3048
2881 cf::object::player 3049 cf::object::player
2882 player 3050 player
2883 3051
… …
2890=cut 3058=cut
2891 3059
2892for ( 3060for (
2893 ["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
2894 insert remove inv name archname title slaying race 3062 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3063 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2899) { 3067) {
2900 no strict 'refs'; 3068 no strict 'refs';
… …
3005 { 3173 {
3006 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
3007 3175
3008 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
3010 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
3012 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};
3013 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};
3014 3183
3015 cf::cede_to_tick; 3184 cf::cede_to_tick;
3016 } 3185 }
3017 3186
3018 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
3020 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
3021 or next; 3191 or next;
3192
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3196 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3044 { 3215 {
3045 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
3048 3219
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3223 my $data;
3054 3224
3055 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
3056 # prepend meta info 3226 # prepend meta info
3057 3227
3058 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
3059 name => $name, 3229 name => $name,
3060 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
3061 }); 3231 });
3062 3232
3063 $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};
3064 } else { 3240 } else {
3065 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
3066 } 3242 }
3067 3243
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3244 cf::cede_to_tick;
3072 } 3245 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3249
3093 1 3250 1
3094} 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});
3095 3272
3096register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
3098 3275
3099 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
… …
3154sub reload_config { 3331sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3333 or return;
3157 3334
3158 local $/; 3335 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3160 3337
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3339
3163 $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};
3164 $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};
… …
3175sub main { 3352sub main {
3176 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3178 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#
3179 (async { 3356 (async {
3180 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3182 }; 3360 };
3183 3361
3184 reload_config; 3362 reload_config;
3185 db_init; 3363 db_init;
3186 load_extensions; 3364 load_extensions;
3187 3365
3188 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start;
3189 Event::loop; 3368 EV::loop;
3190} 3369}
3191 3370
3192############################################################################# 3371#############################################################################
3193# initialisation and cleanup 3372# initialisation and cleanup
3194 3373
3195# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3196BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3205 },
3206 ); 3380 };
3207 } 3381 }
3208} 3382}
3209 3383
3210sub write_runtime { 3384sub write_runtime {
3211 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
… …
3256 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3436 $pl->save;
3262 } 3437 }
3263 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3264 3439
3265 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
… …
3304 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3481
3307 # 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
3308 3483
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3315 for (;;) { 3485 for (;;) {
3316 BDB::flush; 3486 BDB::flush;
3317 IO::AIO::flush; 3487 IO::AIO::flush;
3318 Coro::cede; 3488 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3490 warn "iterate...";
3321 } 3491 }
3322 3492
3323 ++$RELOAD; 3493 ++$RELOAD;
… …
3399 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3400 3570
3401 1 3571 1
3402 } or do { 3572 } or do {
3403 warn $@; 3573 warn $@;
3404 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3575 };
3407 3576
3408 warn "reloaded"; 3577 warn "reloaded";
3409}; 3578};
3410 3579
… …
3412 3581
3413sub reload_perl() { 3582sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3416 3585
3417 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3587 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3424 },
3425 ); 3589 };
3426} 3590}
3427 3591
3428register_command "reload" => sub { 3592register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3430 3594
3431 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3599 reload_perl;
3600 };
3434 } 3601 }
3435}; 3602};
3436 3603
3437unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3438 3605
… …
3440 3607
3441our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3443 3610
3444sub wait_for_tick { 3611sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3446 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3447 3614
3448 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3617 $signal->wait;
3451} 3618}
3452 3619
3453sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3455 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3456 3623
3457 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3626 $signal->wait;
3460} 3627}
3461 3628
3462$TICK_WATCHER = Event->timer ( 3629sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3470 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"
3471 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3472 return; 3633 return;
3473 } 3634 }
3474 3635
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3478 3637
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3640 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3642 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3643 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3644 };
3645 }
3489 3646
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3648 $sig->send;
3492 } 3649 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3651 $sig->send;
3495 } 3652 }
3496 3653
3497 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3656
3508 _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 }
3509 }, 3663 }
3510); 3664}
3511 3665
3512{ 3666{
3667 # configure BDB
3668
3513 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3670 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3671 $Coro::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3672
3539 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3541 $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
3542 | BDB::LOG_AUTOREMOVE, 1); 3676 | BDB::LOG_AUTOREMOVE, 1);
… …
3557 3691
3558 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3693 };
3560 } 3694 }
3561 3695
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 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 { };
3570 },
3571 ); 3698 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3701 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3704 };
3592} 3705}
3593 3706
3594{ 3707{
3708 # configure IO::AIO
3709
3595 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3713}
3608 3714
3609my $_log_backtrace; 3715my $_log_backtrace;
3610 3716
3611sub _log_backtrace { 3717sub _log_backtrace {
… …
3615 3721
3616 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3724 ++$_log_backtrace;
3619 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3620 my @bt = fork_call { 3728 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 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 |"
3624 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

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