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.431 by elmex, Sun May 4 19:27:27 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 398our @SLOT_QUEUE;
355our $SLOT_QUEUE; 399our $SLOT_QUEUE;
356 400
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
359 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
360 406
361 while () { 407 while () {
362 next_job: 408 next_job:
363 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
371 } 417 }
372 } 418 }
373 } 419 }
374 420
375 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 424 $signal->wait;
379 } else { 425 } else {
380 Coro::schedule; 426 Coro::schedule;
381 } 427 }
382 } 428 }
383}; 429};
384 430
385sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
386 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
387 435
388 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
390 438
404 452
405BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
406 454
407=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
408 456
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 458is 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 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 460acceptable.
413 461
414If it must be done, put the blocking parts into C<sync_job>. This will run 462If 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 463the given BLOCK in another coroutine while waiting for the result. The
420 468
421sub sync_job(&) { 469sub sync_job(&) {
422 my ($job) = @_; 470 my ($job) = @_;
423 471
424 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 473 my $time = EV::time;
426 474
427 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
429 477
430 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 479
432 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
433 481
434 my $busy = 1; 482 my $busy = 1;
435 my @res; 483 my @res;
436 484
437 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 487 @res = eval { $job->() };
439 warn $@ if $@; 488 warn $@ if $@;
440 undef $busy; 489 undef $busy;
441 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
442 491
443 while ($busy) { 492 while ($busy) {
444 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
445 } 497 }
498 }
446 499
447 $time = Event::time - $time; 500 my $time = EV::time - $time;
448 501
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 502 $TICK_START += $time; # do not account sync jobs to server load
453 503
454 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
455 } else { 505 } else {
456 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
457 507
482=item fork_call { }, $args 532=item fork_call { }, $args
483 533
484Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
488 538
489=cut 539=cut
490 540
491sub fork_call(&@) { 541sub fork_call(&@) {
492 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
499 reset_signals; 549 reset_signals;
500 &$cb 550 &$cb
501 }, @args; 551 }, @args;
502 552
503 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
504} 581}
505 582
506=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
507 584
508Returns a single value from the environment database. 585Returns a single value from the environment database.
653attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
655 732
656In the following description, CLASS can be any of C<global>, C<object> 733In 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 734C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 735Deliantra).
659 736
660=over 4 737=over 4
661 738
662=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
663 740
945 } 1022 }
946 1023
947 0 1024 0
948} 1025}
949 1026
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1028
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1030
954Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
955 1032
961 1038
962=cut 1039=cut
963 1040
964############################################################################# 1041#############################################################################
965# object support 1042# object support
966#
967 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
968sub _can_merge { 1077sub _can_merge {
969 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
970 1079
971 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1081
975 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
976} 1084}
977 1085
978sub reattach { 1086sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1088 my ($obj) = @_;
1002cf::attachable->attach ( 1110cf::attachable->attach (
1003 prio => -1000000, 1111 prio => -1000000,
1004 on_instantiate => sub { 1112 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1006 1114
1007 $data = from_json $data; 1115 $data = decode_json $data;
1008 1116
1009 for (@$data) { 1117 for (@$data) {
1010 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1011 1119
1012 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1033 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1036 1144
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1041 close $fh; 1149 aio_close $fh;
1042 1150
1043 if (@$objs) { 1151 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1157 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1159 }
1052 } else { 1160 } else {
1053 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1054 } 1162 }
1082 1190
1083 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1193 or return;
1086 1194
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1088 } 1197 }
1089 1198
1090 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1248 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1250 1359
1251 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1361 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1363 }
1256 1364
1257 warn $msg; 1365 warn $msg;
1258 } 1366 }
1259 1367
1348 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1457 or return;
1350 1458
1351 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1352 or return; 1460 or return;
1461
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1356 } 1465 }
1357 } 1466 }
1367 1476
1368 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1369 1478
1370 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1372 1483
1373 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1485 cf::cede_to_tick;
1375} 1486}
1376 1487
1460 1571
1461 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1462 my $path = path $login; 1573 my $path = path $login;
1463 1574
1464 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1581 }
1470 1582
1507 1619
1508Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1509 1621
1510=cut 1622=cut
1511 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1512sub expand_cfpod { 1635sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1514 1637
1515 # escape & and < 1638 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1639
1519 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1520 1643
1521 1 while 1644 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1527 # replace G<male|female> tags 1650 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1529 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1530 }ge 1653 | < $interior >
1531 # replace H<hint text> 1654 )
1532 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1533 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1677 "")
1537 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1539 1689
1690 for ($xml) {
1540 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1542 1693
1543 # compress some whitespace 1694 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1548 1700
1549 $_ 1701 $xml
1550} 1702}
1703
1704no re 'eval';
1551 1705
1552sub hintmode { 1706sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1708 $_[0]{hintmode}
1555} 1709}
1627our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1629 1783
1630sub generate_random_map { 1784sub generate_random_map {
1631 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1632 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1790 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 1915
1759# the temporary/swap location 1916# the temporary/swap location
1760sub save_path { 1917sub save_path {
1761 my ($self) = @_; 1918 my ($self) = @_;
1762 1919
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1765} 1922}
1766 1923
1767# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1768sub uniq_path { 1925sub uniq_path {
1769 my ($self) = @_; 1926 my ($self) = @_;
1770 1927
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1773} 1930}
1774 1931
1775# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1776# all maps in C++... 1933# all maps in C++...
1874 2031
1875 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1877 2034
1878 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
1881 2038
1882 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1883 or return; 2040 or return;
1884 2041
1885 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1888 or return; 2045 or return;
1889 2046
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1893 undef $guard1; 2051 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2052 $map->reset;
1896 return find $path; 2053 return find $path;
1897 } 2054 }
1898 2055
1899 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1962 } 2119 }
1963 2120
1964 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1966 2123
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2125 }
1969 2126
1970 $self->post_load; 2127 $self->post_load;
1971} 2128}
1972 2129
2030 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2031 2188
2032 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2033 2190
2034 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2193 }
2037 2194
2038 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2039 2196
2040 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
2041 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2202 if (my $map = find $k) {
2044 $map->load if $v; 2203 $map->load if $v;
2045 } 2204 }
2071 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2072 2231
2073 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2074 2233
2075 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2077 }; 2237 };
2238
2239 cf::get_slot 0.02;
2078 2240
2079 if ($uniq) { 2241 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2244 } else {
2091 $self->save; 2253 $self->save;
2092 2254
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2256
2095 return if $self->players; 2257 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2098 2260
2099 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2100 2262
2101 $self->deactivate; 2263 $self->deactivate;
2219 2381
2220sub unique_maps() { 2382sub unique_maps() {
2221 [ 2383 [
2222 map { 2384 map {
2223 utf8::decode $_; 2385 utf8::decode $_;
2224 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2225 ? normalise $_ 2389 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2391 ]
2229} 2392}
2230 2393
2231package cf;
2232
2233=back 2394=back
2234 2395
2235=head3 cf::object 2396=head3 cf::object
2236 2397
2237=cut 2398=cut
2240 2401
2241=over 4 2402=over 4
2242 2403
2243=item $ob->inv_recursive 2404=item $ob->inv_recursive
2244 2405
2245Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2246 2408
2247=cut 2409=cut
2248 2410
2249sub inv_recursive_; 2411sub inv_recursive_;
2250sub inv_recursive_ { 2412sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2256} 2418}
2257 2419
2258=item $ref = $ob->ref 2420=item $ref = $ob->ref
2259 2421
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2261 2423
2262=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2263 2425
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2427even if the object actually exists. May block.
2267=cut 2429=cut
2268 2430
2269sub deref { 2431sub deref {
2270 my ($ref) = @_; 2432 my ($ref) = @_;
2271 2433
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2435 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2437 or return;
2279 $pl->ob->uuid eq $uuid 2438 $pl->ob->uuid eq $uuid
2280 or return; 2439 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2460dialogue with the given NPC character.
2302 2461
2303=cut 2462=cut
2304 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2305# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2479# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2495
2323 } else { 2496 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2499 }
2327 } 2500 }
2328} 2501}
2329 2502
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2625
2453 $self->enter_link; 2626 $self->enter_link;
2454 2627
2455 (async { 2628 (async {
2629 $Coro::current->{desc} = "player::goto $path $x $y";
2630
2456 # *tag paths override both path and x|y 2631 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2632 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2633 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2634 my $ob = $obs[rand @obs];
2460 2635
2523} 2698}
2524 2699
2525sub prepare_random_map { 2700sub prepare_random_map {
2526 my ($exit) = @_; 2701 my ($exit) = @_;
2527 2702
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2705 # that depends on the exit object
2533 2706
2534 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2709 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2541 } 2716 }
2542 2717
2543 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2544 2719
2545 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2548 2723
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2726 undef $fh;
2552 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2553 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2556 } 2735 }
2557} 2736}
2558 2737
2559sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2561 2740
2562 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2563 2742
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2743 $self->enter_link;
2576 2744
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2745 (async {
2582 $self->deactivate_recursive; # just to be sure 2746 $Coro::current->{desc} = "enter_exit";
2747
2583 unless (eval { 2748 unless (eval {
2749 $self->deactivate_recursive; # just to be sure
2750
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2760 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp;
2762
2584 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2585 2764
2765 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED);
2768
2586 1; 2769 1
2587 }) { 2770 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2589 . "I'll try to bring you back to the map you were before. " 2772 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2804the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2805the message unless the client supports the msg packet.
2623 2806
2624=cut 2807=cut
2625 2808
2809# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2810our %CHANNEL = (
2627 "c/identify" => { 2811 "c/identify" => {
2628 id => "identify", 2812 id => "infobox",
2629 title => "Identify", 2813 title => "Identify",
2630 reply => undef, 2814 reply => undef,
2631 tooltip => "Items recently identified", 2815 tooltip => "Items recently identified",
2632 }, 2816 },
2633 "c/examine" => { 2817 "c/examine" => {
2634 id => "examine", 2818 id => "infobox",
2635 title => "Examine", 2819 title => "Examine",
2636 reply => undef, 2820 reply => undef,
2637 tooltip => "Signs and other items you examined", 2821 tooltip => "Signs and other items you examined",
2638 }, 2822 },
2823 "c/book" => {
2824 id => "infobox",
2825 title => "Book",
2826 reply => undef,
2827 tooltip => "The contents of a note or book",
2828 },
2829 "c/lookat" => {
2830 id => "infobox",
2831 title => "Look",
2832 reply => undef,
2833 tooltip => "What you saw there",
2834 },
2835 "c/who" => {
2836 id => "infobox",
2837 title => "Players",
2838 reply => undef,
2839 tooltip => "Shows players who are currently online",
2840 },
2841 "c/body" => {
2842 id => "infobox",
2843 title => "Body Parts",
2844 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available",
2846 },
2847 "c/uptime" => {
2848 id => "infobox",
2849 title => "Uptime",
2850 reply => undef,
2851 tooltip => "How long the server has been running since last restart",
2852 },
2853 "c/mapinfo" => {
2854 id => "infobox",
2855 title => "Map Info",
2856 reply => undef,
2857 tooltip => "Information related to the maps",
2858 },
2859 "c/party" => {
2860 id => "party",
2861 title => "Party",
2862 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party",
2864 },
2639); 2865);
2640 2866
2641sub cf::client::send_msg { 2867sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2869
2644 $msg = $self->pl->expand_cfpod ($msg); 2870 $msg = $self->pl->expand_cfpod ($msg);
2645 2871
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2872 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2873
2648 # check predefined channels, for the benefit of C 2874 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2875 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel};
2650 2877
2878 $self->ext_msg (channel_info => $channel)
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id};
2882
2651 if (ref $channel) { 2883 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2884 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2885 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2886 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2887 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2888 if $self->can_msg;
2873=pod 3105=pod
2874 3106
2875The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
2876 3108
2877 cf::object 3109 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3110 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3111 insert remove name archname title slaying race decrease split
2880 3112
2881 cf::object::player 3113 cf::object::player
2882 player 3114 player
2883 3115
2884 cf::player 3116 cf::player
2889 3121
2890=cut 3122=cut
2891 3123
2892for ( 3124for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3126 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3127 decrease split destroy)],
2896 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
2899) { 3131) {
2900 no strict 'refs'; 3132 no strict 'refs';
3005 { 3237 {
3006 my $faces = $facedata->{faceinfo}; 3238 my $faces = $facedata->{faceinfo};
3007 3239
3008 while (my ($face, $info) = each %$faces) { 3240 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3241 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242
3010 cf::face::set_visibility $idx, $info->{visibility}; 3243 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3244 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3245 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}; 3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3247
3015 cf::cede_to_tick; 3248 cf::cede_to_tick;
3016 } 3249 }
3017 3250
3018 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3252 next unless $info->{smooth};
3253
3020 my $idx = cf::face::find $face 3254 my $idx = cf::face::find $face
3021 or next; 3255 or next;
3256
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3257 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3258 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3260 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3261 warn "smooth face '$info->{smooth}' not found for face '$face'";
3044 { 3279 {
3045 # TODO: for gcfclient pleasure, we should give resources 3280 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3281 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3282 my $res = $facedata->{resource};
3048 3283
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3284 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3286 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3287 my $data;
3054 3288
3055 if ($info->{type} & 1) { 3289 if ($info->{type} & 1) {
3056 # prepend meta info 3290 # prepend meta info
3057 3291
3058 my $meta = $enc->encode ({ 3292 my $meta = $enc->encode ({
3059 name => $name, 3293 name => $name,
3060 %{ $info->{meta} || {} }, 3294 %{ $info->{meta} || {} },
3061 }); 3295 });
3062 3296
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type};
3064 } else { 3304 } else {
3065 $data = $info->{data}; 3305 $RESOURCE{$name} = $info;
3066 } 3306 }
3067 3307
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; 3308 cf::cede_to_tick;
3072 } 3309 }
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 } 3310 }
3311
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3313
3093 1 3314 1
3094} 3315}
3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3095 3336
3096register_exticmd fx_want => sub { 3337register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3338 my ($ns, $want) = @_;
3098 3339
3099 while (my ($k, $v) = each %$want) { 3340 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3341 $ns->fx_want ($k, $v);
3101 } 3342 }
3102}; 3343};
3344
3345sub load_resource_file($) {
3346 my $guard = lock_acquire "load_resource_file";
3347
3348 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100;
3350 cf::arch::commit_load;
3351
3352 $status
3353}
3103 3354
3104sub reload_regions { 3355sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3356 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3357 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3372}
3122 3373
3123sub reload_archetypes { 3374sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3376 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3377}
3132 3378
3133sub reload_treasures { 3379sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
3136} 3382}
3137 3383
3138sub reload_resources { 3384sub reload_resources {
3139 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
3140 3386
3387 reload_facedata;
3388 reload_archetypes;
3141 reload_regions; 3389 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3390 reload_treasures;
3146 3391
3147 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
3148} 3393}
3149 3394
3150sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
3151 reload_resources; 3398 reload_resources;
3152} 3399}
3153 3400
3154sub reload_config { 3401sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3403 or return;
3157 3404
3158 local $/; 3405 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::Load <$fh>;
3160 3407
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3409
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $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}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175sub main { 3422sub main {
3176 # we must not ever block the main coroutine 3423 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3424 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3426 (async {
3180 Event::one_event; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
3182 }; 3430 };
3183 3431
3432 {
3433 my $guard = freeze_mainloop;
3184 reload_config; 3434 reload_config;
3185 db_init; 3435 db_init;
3186 load_extensions; 3436 load_extensions;
3187 3437
3188 $TICK_WATCHER->start; 3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 }
3441
3189 Event::loop; 3442 EV::loop;
3190} 3443}
3191 3444
3192############################################################################# 3445#############################################################################
3193# initialisation and cleanup 3446# initialisation and cleanup
3194 3447
3195# install some emergency cleanup handlers 3448# install some emergency cleanup handlers
3196BEGIN { 3449BEGIN {
3450 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3451 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3452 $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"; 3453 cf::cleanup "SIG$signal";
3205 },
3206 ); 3454 };
3207 } 3455 }
3208} 3456}
3209 3457
3210sub write_runtime { 3458sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
3212 3460
3213 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
3215 3463
3241 and return; 3489 and return;
3242 3490
3243 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
3244 3492
3245 1 3493 1
3494}
3495
3496our $uuid_lock;
3497our $uuid_skip;
3498
3499sub write_uuid_sync($) {
3500 $uuid_skip ||= $_[0];
3501
3502 return if $uuid_lock;
3503 local $uuid_lock = 1;
3504
3505 my $uuid = "$LOCALDIR/uuid";
3506
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return;
3509
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3246} 3537}
3247 3538
3248sub emergency_save() { 3539sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3250 3541
3256 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3548 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3553 $pl->save;
3262 } 3554 }
3263 warn "end emergency player save\n"; 3555 warn "end emergency player save\n";
3264 3556
3265 warn "begin emergency map save\n"; 3557 warn "begin emergency map save\n";
3271 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
3272 3564
3273 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3567 warn "end emergency database checkpoint\n";
3568
3569 warn "begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "end write uuid\n";
3276 }; 3572 };
3277 3573
3278 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
3279} 3575}
3280 3576
3295 warn "reloading..."; 3591 warn "reloading...";
3296 3592
3297 warn "entering sync_job"; 3593 warn "entering sync_job";
3298 3594
3299 cf::sync_job { 3595 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3597 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3303 3599
3304 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3602
3307 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3308
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313 3604
3314 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3315 for (;;) { 3606 for (;;) {
3316 BDB::flush; 3607 BDB::flush;
3317 IO::AIO::flush; 3608 IO::AIO::flush;
3318 Coro::cede; 3609 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3610 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3611 warn "iterate...";
3321 } 3612 }
3322 3613
3323 ++$RELOAD; 3614 ++$RELOAD;
3399 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3400 3691
3401 1 3692 1
3402 } or do { 3693 } or do {
3403 warn $@; 3694 warn $@;
3404 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3696 };
3407 3697
3408 warn "reloaded"; 3698 warn "reloaded";
3409}; 3699};
3410 3700
3412 3702
3413sub reload_perl() { 3703sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3704 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3705 # coro crashes during coro_state_free->destroy here.
3416 3706
3417 $RELOAD_WATCHER ||= Event->timer ( 3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3708 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3709 undef $RELOAD_WATCHER;
3424 },
3425 ); 3710 };
3426} 3711}
3427 3712
3428register_command "reload" => sub { 3713register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3714 my ($who, $arg) = @_;
3430 3715
3431 if ($who->flag (FLAG_WIZ)) { 3716 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3717 $who->message ("reloading server.");
3718 async {
3719 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3720 reload_perl;
3721 };
3434 } 3722 }
3435}; 3723};
3436 3724
3437unshift @INC, $LIBDIR; 3725unshift @INC, $LIBDIR;
3438 3726
3440 3728
3441our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3443 3731
3444sub wait_for_tick { 3732sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3447 3734
3448 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3737 $signal->wait;
3451} 3738}
3452 3739
3453sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3456 3742
3457 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3745 $signal->wait;
3460} 3746}
3461 3747
3462$TICK_WATCHER = Event->timer ( 3748sub 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) { 3749 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3750 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3472 return; 3752 return;
3473 } 3753 }
3474 3754
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3478 3756
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3759 Coro::async_pool {
3760 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3761 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3762 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3763 };
3764 }
3489 3765
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3767 $sig->send;
3492 } 3768 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3770 $sig->send;
3495 } 3771 }
3496 3772
3497 $NOW = Event::time; 3773 $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; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3775
3508 _post_tick; 3776 if (0) {
3777 if ($NEXT_TICK) {
3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3509 }, 3782 }
3510); 3783}
3511 3784
3512{ 3785{
3786 # configure BDB
3787
3513 BDB::min_parallel 8; 3788 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3789 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3790 $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 3791
3539 unless ($DB_ENV) { 3792 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3793 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1); 3795 | BDB::LOG_AUTOREMOVE, 1);
3557 3810
3558 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3812 };
3560 } 3813 }
3561 3814
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3815 $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 { }; 3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3817 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3818 $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 { }; 3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3820 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3821 $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 { }; 3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3823 };
3592} 3824}
3593 3825
3594{ 3826{
3827 # configure IO::AIO
3828
3595 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3831 $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} 3832}
3608 3833
3609my $_log_backtrace; 3834my $_log_backtrace;
3610 3835
3611sub _log_backtrace { 3836sub _log_backtrace {
3615 3840
3616 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3843 ++$_log_backtrace;
3619 async { 3844 async {
3845 $Coro::current->{desc} = "abt $msg";
3846
3620 my @bt = fork_call { 3847 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3848 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3849 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3850 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3851 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines