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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines