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.432 by root, Mon May 5 22:38:47 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
1412 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1414 1525
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1419 1532
1420 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1573
1461 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1462 my $path = path $login; 1575 my $path = path $login;
1463 1576
1464 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1583 }
1470 1584
1507 1621
1508Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1509 1623
1510=cut 1624=cut
1511 1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1512sub expand_cfpod { 1637sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1514 1639
1515 # escape & and < 1640 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1641
1519 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1520 1645
1521 1 while 1646 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1651 ([BCGHITU])
1527 # replace G<male|female> tags 1652 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1653 (?:
1529 $self->gender ? $2 : $1 1654 ([^<>]*) (?{ $group = $^N })
1530 }ge 1655 | < $interior >
1531 # replace H<hint text> 1656 )
1532 || s{H<([^\>]*)>} 1657 >
1658 %gcsx
1533 { 1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1679 "")
1537 [$self->{hintmode}] 1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1539 1691
1692 for ($xml) {
1540 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1542 1695
1543 # compress some whitespace 1696 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1697 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1698 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1699 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1700 s/\n+$//; # ending lines
1701 }
1548 1702
1549 $_ 1703 $xml
1550} 1704}
1705
1706no re 'eval';
1551 1707
1552sub hintmode { 1708sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1710 $_[0]{hintmode}
1555} 1711}
1627our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1629 1785
1630sub generate_random_map { 1786sub generate_random_map {
1631 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1632 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1792 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 1917
1759# the temporary/swap location 1918# the temporary/swap location
1760sub save_path { 1919sub save_path {
1761 my ($self) = @_; 1920 my ($self) = @_;
1762 1921
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1765} 1924}
1766 1925
1767# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1768sub uniq_path { 1927sub uniq_path {
1769 my ($self) = @_; 1928 my ($self) = @_;
1770 1929
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1773} 1932}
1774 1933
1775# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1776# all maps in C++... 1935# all maps in C++...
1874 2033
1875 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1877 2036
1878 $cf::MAP{$path} || do { 2037 $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 2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
1881 2040
1882 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1883 or return; 2042 or return;
1884 2043
1885 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1888 or return; 2047 or return;
1889 2048
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
1893 undef $guard1; 2053 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2054 $map->reset;
1896 return find $path; 2055 return find $path;
1897 } 2056 }
1898 2057
1899 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1962 } 2121 }
1963 2122
1964 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
1966 2125
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2127 }
1969 2128
1970 $self->post_load; 2129 $self->post_load;
1971} 2130}
1972 2131
2030 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2031 2190
2032 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2033 2192
2034 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2195 }
2037 2196
2038 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2039 2198
2040 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
2041 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2204 if (my $map = find $k) {
2044 $map->load if $v; 2205 $map->load if $v;
2045 } 2206 }
2071 return if $self->{deny_save}; 2232 return if $self->{deny_save};
2072 2233
2073 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
2074 2235
2075 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2077 }; 2239 };
2240
2241 cf::get_slot 0.02;
2078 2242
2079 if ($uniq) { 2243 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2246 } else {
2091 $self->save; 2255 $self->save;
2092 2256
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2258
2095 return if $self->players; 2259 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2098 2262
2099 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2100 2264
2101 $self->deactivate; 2265 $self->deactivate;
2219 2383
2220sub unique_maps() { 2384sub unique_maps() {
2221 [ 2385 [
2222 map { 2386 map {
2223 utf8::decode $_; 2387 utf8::decode $_;
2224 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2225 ? normalise $_ 2391 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2393 ]
2229} 2394}
2230 2395
2231package cf;
2232
2233=back 2396=back
2234 2397
2235=head3 cf::object 2398=head3 cf::object
2236 2399
2237=cut 2400=cut
2240 2403
2241=over 4 2404=over 4
2242 2405
2243=item $ob->inv_recursive 2406=item $ob->inv_recursive
2244 2407
2245Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2246 2410
2247=cut 2411=cut
2248 2412
2249sub inv_recursive_; 2413sub inv_recursive_;
2250sub inv_recursive_ { 2414sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2256} 2420}
2257 2421
2258=item $ref = $ob->ref 2422=item $ref = $ob->ref
2259 2423
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2424Creates and returns a persistent reference to an object that can be stored as a string.
2261 2425
2262=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2263 2427
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2429even if the object actually exists. May block.
2267=cut 2431=cut
2268 2432
2269sub deref { 2433sub deref {
2270 my ($ref) = @_; 2434 my ($ref) = @_;
2271 2435
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2436 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2437 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2438 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2439 or return;
2279 $pl->ob->uuid eq $uuid 2440 $pl->ob->uuid eq $uuid
2280 or return; 2441 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2462dialogue with the given NPC character.
2302 2463
2303=cut 2464=cut
2304 2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2479
2305# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2481# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2497
2323 } else { 2498 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2501 }
2327 } 2502 }
2328} 2503}
2329 2504
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2627
2453 $self->enter_link; 2628 $self->enter_link;
2454 2629
2455 (async { 2630 (async {
2631 $Coro::current->{desc} = "player::goto $path $x $y";
2632
2456 # *tag paths override both path and x|y 2633 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2634 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2635 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2636 my $ob = $obs[rand @obs];
2460 2637
2523} 2700}
2524 2701
2525sub prepare_random_map { 2702sub prepare_random_map {
2526 my ($exit) = @_; 2703 my ($exit) = @_;
2527 2704
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2707 # that depends on the exit object
2533 2708
2534 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2711 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2541 } 2718 }
2542 2719
2543 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2544 2721
2545 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2548 2725
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2728 undef $fh;
2552 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2553 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2556 } 2737 }
2557} 2738}
2558 2739
2559sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2561 2742
2562 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2563 2744
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; 2745 $self->enter_link;
2576 2746
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 { 2747 (async {
2582 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2583 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2584 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2585 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2586 1; 2771 1
2587 }) { 2772 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2589 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2806the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2623 2808
2624=cut 2809=cut
2625 2810
2811# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2812our %CHANNEL = (
2627 "c/identify" => { 2813 "c/identify" => {
2628 id => "identify", 2814 id => "infobox",
2629 title => "Identify", 2815 title => "Identify",
2630 reply => undef, 2816 reply => undef,
2631 tooltip => "Items recently identified", 2817 tooltip => "Items recently identified",
2632 }, 2818 },
2633 "c/examine" => { 2819 "c/examine" => {
2634 id => "examine", 2820 id => "infobox",
2635 title => "Examine", 2821 title => "Examine",
2636 reply => undef, 2822 reply => undef,
2637 tooltip => "Signs and other items you examined", 2823 tooltip => "Signs and other items you examined",
2638 }, 2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/uptime" => {
2850 id => "infobox",
2851 title => "Uptime",
2852 reply => undef,
2853 tooltip => "How long the server has been running since last restart",
2854 },
2855 "c/mapinfo" => {
2856 id => "infobox",
2857 title => "Map Info",
2858 reply => undef,
2859 tooltip => "Information related to the maps",
2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2639); 2867);
2640 2868
2641sub cf::client::send_msg { 2869sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2871
2644 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2645 2873
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2875
2648 # check predefined channels, for the benefit of C 2876 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2877 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel};
2650 2879
2880 $self->ext_msg (channel_info => $channel)
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id};
2884
2651 if (ref $channel) { 2885 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2890 if $self->can_msg;
2873=pod 3107=pod
2874 3108
2875The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2876 3110
2877 cf::object 3111 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3112 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
2880 3114
2881 cf::object::player 3115 cf::object::player
2882 player 3116 player
2883 3117
2884 cf::player 3118 cf::player
2889 3123
2890=cut 3124=cut
2891 3125
2892for ( 3126for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3129 decrease split destroy)],
2896 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2899) { 3133) {
2900 no strict 'refs'; 3134 no strict 'refs';
3005 { 3239 {
3006 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
3007 3241
3008 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
3010 cf::face::set_visibility $idx, $info->{visibility}; 3245 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3246 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3247 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}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3249
3015 cf::cede_to_tick; 3250 cf::cede_to_tick;
3016 } 3251 }
3017 3252
3018 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
3020 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
3021 or next; 3257 or next;
3258
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3260 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3262 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
3044 { 3281 {
3045 # TODO: for gcfclient pleasure, we should give resources 3282 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3283 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3284 my $res = $facedata->{resource};
3048 3285
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3286 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3289 my $data;
3054 3290
3055 if ($info->{type} & 1) { 3291 if ($info->{type} & 1) {
3056 # prepend meta info 3292 # prepend meta info
3057 3293
3058 my $meta = $enc->encode ({ 3294 my $meta = $enc->encode ({
3059 name => $name, 3295 name => $name,
3060 %{ $info->{meta} || {} }, 3296 %{ $info->{meta} || {} },
3061 }); 3297 });
3062 3298
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type};
3064 } else { 3306 } else {
3065 $data = $info->{data}; 3307 $RESOURCE{$name} = $info;
3066 } 3308 }
3067 3309
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; 3310 cf::cede_to_tick;
3072 } 3311 }
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 } 3312 }
3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3315
3093 1 3316 1
3094} 3317}
3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3095 3338
3096register_exticmd fx_want => sub { 3339register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3340 my ($ns, $want) = @_;
3098 3341
3099 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3101 } 3344 }
3102}; 3345};
3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3103 3356
3104sub reload_regions { 3357sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3358 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3359 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3374}
3122 3375
3123sub reload_archetypes { 3376sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3378 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} 3379}
3132 3380
3133sub reload_treasures { 3381sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3136} 3384}
3137 3385
3138sub reload_resources { 3386sub reload_resources {
3139 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3140 3388
3389 reload_facedata;
3390 reload_archetypes;
3141 reload_regions; 3391 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3392 reload_treasures;
3146 3393
3147 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3148} 3395}
3149 3396
3150sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3151 reload_resources; 3400 reload_resources;
3152} 3401}
3153 3402
3154sub reload_config { 3403sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3405 or return;
3157 3406
3158 local $/; 3407 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
3160 3409
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3411
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $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}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175sub main { 3424sub main {
3176 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3428 (async {
3180 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3182 }; 3432 };
3183 3433
3434 {
3435 my $guard = freeze_mainloop;
3184 reload_config; 3436 reload_config;
3185 db_init; 3437 db_init;
3186 load_extensions; 3438 load_extensions;
3187 3439
3188 $TICK_WATCHER->start; 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3189 Event::loop; 3444 EV::loop;
3190} 3445}
3191 3446
3192############################################################################# 3447#############################################################################
3193# initialisation and cleanup 3448# initialisation and cleanup
3194 3449
3195# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
3196BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3454 $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"; 3455 cf::cleanup "SIG$signal";
3205 },
3206 ); 3456 };
3207 } 3457 }
3208} 3458}
3209 3459
3210sub write_runtime { 3460sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3212 3462
3213 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3215 3465
3241 and return; 3491 and return;
3242 3492
3243 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3244 3494
3245 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
3246} 3539}
3247 3540
3248sub emergency_save() { 3541sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3250 3543
3256 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3555 $pl->save;
3262 } 3556 }
3263 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
3264 3558
3265 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
3271 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3272 3566
3273 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
3276 }; 3574 };
3277 3575
3278 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3279} 3577}
3280 3578
3295 warn "reloading..."; 3593 warn "reloading...";
3296 3594
3297 warn "entering sync_job"; 3595 warn "entering sync_job";
3298 3596
3299 cf::sync_job { 3597 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3599 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3303 3601
3304 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3604
3307 # if anything goes wrong in here, we should simply crash as we already saved 3605 # 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 3606
3314 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
3315 for (;;) { 3608 for (;;) {
3316 BDB::flush; 3609 BDB::flush;
3317 IO::AIO::flush; 3610 IO::AIO::flush;
3318 Coro::cede; 3611 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3613 warn "iterate...";
3321 } 3614 }
3322 3615
3323 ++$RELOAD; 3616 ++$RELOAD;
3399 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3400 3693
3401 1 3694 1
3402 } or do { 3695 } or do {
3403 warn $@; 3696 warn $@;
3404 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3698 };
3407 3699
3408 warn "reloaded"; 3700 warn "reloaded";
3409}; 3701};
3410 3702
3412 3704
3413sub reload_perl() { 3705sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3416 3708
3417 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3710 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3424 },
3425 ); 3712 };
3426} 3713}
3427 3714
3428register_command "reload" => sub { 3715register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3430 3717
3431 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3722 reload_perl;
3723 };
3434 } 3724 }
3435}; 3725};
3436 3726
3437unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3438 3728
3440 3730
3441our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3443 3733
3444sub wait_for_tick { 3734sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3447 3736
3448 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3739 $signal->wait;
3451} 3740}
3452 3741
3453sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3456 3744
3457 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3747 $signal->wait;
3460} 3748}
3461 3749
3462$TICK_WATCHER = Event->timer ( 3750sub 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) { 3751 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3472 return; 3754 return;
3473 } 3755 }
3474 3756
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3478 3758
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3761 Coro::async_pool {
3762 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3763 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3765 };
3766 }
3489 3767
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3769 $sig->send;
3492 } 3770 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3772 $sig->send;
3495 } 3773 }
3496 3774
3497 $NOW = Event::time; 3775 $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; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3777
3508 _post_tick; 3778 if (0) {
3779 if ($NEXT_TICK) {
3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3509 }, 3784 }
3510); 3785}
3511 3786
3512{ 3787{
3788 # configure BDB
3789
3513 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3791 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3792 $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 3793
3539 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3795 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1); 3797 | BDB::LOG_AUTOREMOVE, 1);
3557 3812
3558 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3814 };
3560 } 3815 }
3561 3816
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3817 $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 { }; 3818 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3819 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3820 $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 { }; 3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3822 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3823 $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 { }; 3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3825 };
3592} 3826}
3593 3827
3594{ 3828{
3829 # configure IO::AIO
3830
3595 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3833 $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} 3834}
3608 3835
3609my $_log_backtrace; 3836my $_log_backtrace;
3610 3837
3611sub _log_backtrace { 3838sub _log_backtrace {
3615 3842
3616 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3845 ++$_log_backtrace;
3619 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3620 my @bt = fork_call { 3849 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3852 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines