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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.433 by root, Sat May 10 22:38:52 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::EV;
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 || {} });
1025 }, 1134 },
1026); 1135);
1027 1136
1028sub object_freezer_save { 1137sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1139
1033 sync_job { 1140 sync_job {
1034 if (length $$rdata) { 1141 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1038 1145
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1043 close $fh; 1150 aio_close $fh;
1044 1151
1045 if (@$objs) { 1152 if (@$objs) {
1046 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) {
1047 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1158 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1160 }
1054 } else { 1161 } else {
1055 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1056 } 1163 }
1062 } else { 1169 } else {
1063 aio_unlink $filename; 1170 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1065 } 1172 }
1066 }; 1173 };
1067
1068 undef $guard;
1069} 1174}
1070 1175
1071sub object_freezer_as_string { 1176sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1073 1178
1078 1183
1079sub object_thawer_load { 1184sub object_thawer_load {
1080 my ($filename) = @_; 1185 my ($filename) = @_;
1081 1186
1082 my ($data, $av); 1187 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1188
1086 (aio_load $filename, $data) >= 0 1189 (aio_load $filename, $data) >= 0
1087 or return; 1190 or return;
1088 1191
1089 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1194 or return;
1092 1195
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1095 } 1198 }
1096 1199
1097 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1255 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1257 1360
1258 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1362 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1364 }
1263 1365
1264 warn $msg; 1366 warn $msg;
1265 } 1367 }
1266 1368
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1456
1355 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1458 or return;
1357 1459
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1360 or return; 1461 or return;
1462
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1364 } 1466 }
1365 } 1467 }
1375 1477
1376 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1377 1479
1378 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1379 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1380 1484
1381 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1486 cf::cede_to_tick;
1383} 1487}
1384 1488
1420 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1421 $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
1422 1526
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1424 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1426 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1427 1533
1428 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1468 1574
1469 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1470 my $path = path $login; 1576 my $path = path $login;
1471 1577
1472 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1584 }
1478 1585
1515 1622
1516Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1517 1624
1518=cut 1625=cut
1519 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
1520sub expand_cfpod { 1638sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1522 1640
1523 # escape & and < 1641 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1642
1527 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1528 1646
1529 1 while 1647 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1535 # replace G<male|female> tags 1653 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1537 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1538 }ge 1656 | < $interior >
1539 # replace H<hint text> 1657 )
1540 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1541 { 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") {
1542 ("<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>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1680 "")
1545 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1547 1692
1693 for ($xml) {
1548 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1550 1696
1551 # compress some whitespace 1697 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1556 1703
1557 $_ 1704 $xml
1558} 1705}
1706
1707no re 'eval';
1559 1708
1560sub hintmode { 1709sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1711 $_[0]{hintmode}
1563} 1712}
1635our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1637 1786
1638sub generate_random_map { 1787sub generate_random_map {
1639 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
1640 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1641 $self->_create_random_map ( 1793 $self->_create_random_map (
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1766 1918
1767# the temporary/swap location 1919# the temporary/swap location
1768sub save_path { 1920sub save_path {
1769 my ($self) = @_; 1921 my ($self) = @_;
1770 1922
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1773} 1925}
1774 1926
1775# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1776sub uniq_path { 1928sub uniq_path {
1777 my ($self) = @_; 1929 my ($self) = @_;
1778 1930
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1781} 1933}
1782 1934
1783# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1784# all maps in C++... 1936# all maps in C++...
1882 2034
1883 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1885 2037
1886 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 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";
1889 2041
1890 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1891 or return; 2043 or return;
1892 2044
1893 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1896 or return; 2048 or return;
1897 2049
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1901 undef $guard1; 2054 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2055 $map->reset;
1904 return find $path; 2056 return find $path;
1905 } 2057 }
1906 2058
1907 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1970 } 2122 }
1971 2123
1972 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1974 2126
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2128 }
1977 2129
1978 $self->post_load; 2130 $self->post_load;
1979} 2131}
1980 2132
2038 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2039 2191
2040 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2041 2193
2042 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2196 }
2045 2197
2046 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2047 2199
2048 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
2049 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2205 if (my $map = find $k) {
2052 $map->load if $v; 2206 $map->load if $v;
2053 } 2207 }
2079 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2080 2234
2081 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2082 2236
2083 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2085 }; 2240 };
2241
2242 cf::get_slot 0.02;
2086 2243
2087 if ($uniq) { 2244 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2247 } else {
2099 $self->save; 2256 $self->save;
2100 2257
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2259
2103 return if $self->players; 2260 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2106 2263
2107 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2108 2265
2109 $self->deactivate; 2266 $self->deactivate;
2227 2384
2228sub unique_maps() { 2385sub unique_maps() {
2229 [ 2386 [
2230 map { 2387 map {
2231 utf8::decode $_; 2388 utf8::decode $_;
2232 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2233 ? normalise $_ 2392 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2394 ]
2237} 2395}
2238 2396
2239package cf;
2240
2241=back 2397=back
2242 2398
2243=head3 cf::object 2399=head3 cf::object
2244 2400
2245=cut 2401=cut
2248 2404
2249=over 4 2405=over 4
2250 2406
2251=item $ob->inv_recursive 2407=item $ob->inv_recursive
2252 2408
2253Returns 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.
2254 2411
2255=cut 2412=cut
2256 2413
2257sub inv_recursive_; 2414sub inv_recursive_;
2258sub inv_recursive_ { 2415sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2264} 2421}
2265 2422
2266=item $ref = $ob->ref 2423=item $ref = $ob->ref
2267 2424
2268creates 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.
2269 2426
2270=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2271 2428
2272returns 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,
2273even if the object actually exists. May block. 2430even if the object actually exists. May block.
2275=cut 2432=cut
2276 2433
2277sub deref { 2434sub deref {
2278 my ($ref) = @_; 2435 my ($ref) = @_;
2279 2436
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2438 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2440 or return;
2287 $pl->ob->uuid eq $uuid 2441 $pl->ob->uuid eq $uuid
2288 or return; 2442 or return;
2308can 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
2309dialogue with the given NPC character. 2463dialogue with the given NPC character.
2310 2464
2311=cut 2465=cut
2312 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
2313# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2482# with dialog boxes.
2315#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
2316sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2329 $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));
2330 2498
2331 } else { 2499 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2502 }
2335 } 2503 }
2336} 2504}
2337 2505
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2628
2461 $self->enter_link; 2629 $self->enter_link;
2462 2630
2463 (async { 2631 (async {
2632 $Coro::current->{desc} = "player::goto $path $x $y";
2633
2464 # *tag paths override both path and x|y 2634 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2635 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2636 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2637 my $ob = $obs[rand @obs];
2468 2638
2531} 2701}
2532 2702
2533sub prepare_random_map { 2703sub prepare_random_map {
2534 my ($exit) = @_; 2704 my ($exit) = @_;
2535 2705
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2708 # that depends on the exit object
2541 2709
2542 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2712 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2549 } 2719 }
2550 2720
2551 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2552 2722
2553 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2556 2726
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2729 undef $fh;
2560 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2561 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2564 } 2738 }
2565} 2739}
2566 2740
2567sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2569 2743
2570 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2571 2745
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2746 $self->enter_link;
2584 2747
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2748 (async {
2590 $self->deactivate_recursive; # just to be sure 2749 $Coro::current->{desc} = "enter_exit";
2750
2591 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2592 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2593 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2594 1; 2772 1
2595 }) { 2773 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2597 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2631 2809
2632=cut 2810=cut
2633 2811
2812# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2813our %CHANNEL = (
2635 "c/identify" => { 2814 "c/identify" => {
2636 id => "identify", 2815 id => "infobox",
2637 title => "Identify", 2816 title => "Identify",
2638 reply => undef, 2817 reply => undef,
2639 tooltip => "Items recently identified", 2818 tooltip => "Items recently identified",
2640 }, 2819 },
2641 "c/examine" => { 2820 "c/examine" => {
2642 id => "examine", 2821 id => "infobox",
2643 title => "Examine", 2822 title => "Examine",
2644 reply => undef, 2823 reply => undef,
2645 tooltip => "Signs and other items you examined", 2824 tooltip => "Signs and other items you examined",
2646 }, 2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/uptime" => {
2851 id => "infobox",
2852 title => "Uptime",
2853 reply => undef,
2854 tooltip => "How long the server has been running since last restart",
2855 },
2856 "c/mapinfo" => {
2857 id => "infobox",
2858 title => "Map Info",
2859 reply => undef,
2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2647); 2868);
2648 2869
2649sub cf::client::send_msg { 2870sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2872
2652 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg);
2653 2874
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2876
2656 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2658 2880
2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id};
2885
2659 if (ref $channel) { 2886 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2887 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2888 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2889 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2890 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2891 if $self->can_msg;
2881=pod 3108=pod
2882 3109
2883The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2884 3111
2885 cf::object 3112 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3113 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
2888 3115
2889 cf::object::player 3116 cf::object::player
2890 player 3117 player
2891 3118
2892 cf::player 3119 cf::player
2897 3124
2898=cut 3125=cut
2899 3126
2900for ( 3127for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3130 decrease split destroy)],
2904 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2907) { 3134) {
2908 no strict 'refs'; 3135 no strict 'refs';
3013 { 3240 {
3014 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3015 3242
3016 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3018 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3022 3250
3023 cf::cede_to_tick; 3251 cf::cede_to_tick;
3024 } 3252 }
3025 3253
3026 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3028 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3029 or next; 3258 or next;
3259
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3263 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
3052 { 3282 {
3053 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3056 3286
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3290 my $data;
3062 3291
3063 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3064 # prepend meta info 3293 # prepend meta info
3065 3294
3066 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3067 name => $name, 3296 name => $name,
3068 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3069 }); 3298 });
3070 3299
3071 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3072 } else { 3307 } else {
3073 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3074 } 3309 }
3075 3310
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3311 cf::cede_to_tick;
3080 } 3312 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3316
3101 1 3317 1
3102} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3103 3339
3104register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3106 3342
3107 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3109 } 3345 }
3110}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3111 3357
3112sub reload_regions { 3358sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3360 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3375}
3130 3376
3131sub reload_archetypes { 3377sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
3139} 3380}
3140 3381
3141sub reload_treasures { 3382sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3144} 3385}
3145 3386
3146sub reload_resources { 3387sub reload_resources {
3147 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3148 3389
3390 reload_facedata;
3391 reload_archetypes;
3149 reload_regions; 3392 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3393 reload_treasures;
3154 3394
3155 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3156} 3396}
3157 3397
3158sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3159 reload_resources; 3401 reload_resources;
3160} 3402}
3161 3403
3162sub reload_config { 3404sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3405 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3406 or return;
3165 3407
3166 local $/; 3408 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3409 *CFG = YAML::Load <$fh>;
3168 3410
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3411 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3412
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3413 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3414 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3183sub main { 3425sub main {
3184 # we must not ever block the main coroutine 3426 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3427 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3428 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3429 (async {
3188 Event::one_event; 3430 $Coro::current->{desc} = "IDLE BUG HANDLER";
3431 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3432 })->prio (Coro::PRIO_MAX);
3190 }; 3433 };
3191 3434
3435 {
3436 my $guard = freeze_mainloop;
3192 reload_config; 3437 reload_config;
3193 db_init; 3438 db_init;
3194 load_extensions; 3439 load_extensions;
3195 3440
3196 $TICK_WATCHER->start; 3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3442 evthread_start IO::AIO::poll_fileno;
3443 }
3444
3197 Event::loop; 3445 EV::loop;
3198} 3446}
3199 3447
3200############################################################################# 3448#############################################################################
3201# initialisation and cleanup 3449# initialisation and cleanup
3202 3450
3203# install some emergency cleanup handlers 3451# install some emergency cleanup handlers
3204BEGIN { 3452BEGIN {
3453 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3454 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3455 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3213 },
3214 ); 3457 };
3215 } 3458 }
3216} 3459}
3217 3460
3218sub write_runtime { 3461sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3462 my $runtime = "$LOCALDIR/runtime";
3220 3463
3221 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3223 3466
3249 and return; 3492 and return;
3250 3493
3251 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3252 3495
3253 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3514 $uuid_skip = 0;
3515
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return;
3518
3519 # always fsync - this file is important
3520 aio_fsync $fh
3521 and return;
3522
3523 close $fh
3524 or return;
3525
3526 aio_rename "$uuid~", $uuid
3527 and return;
3528
3529 warn "uuid file written ($value).\n";
3530
3531 1
3532
3533}
3534
3535sub write_uuid($$) {
3536 my ($skip, $sync) = @_;
3537
3538 $sync ? write_uuid_sync $skip
3539 : async { write_uuid_sync $skip };
3254} 3540}
3255 3541
3256sub emergency_save() { 3542sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3543 my $freeze_guard = cf::freeze_mainloop;
3258 3544
3264 # and maps saved/destroyed asynchronously. 3550 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3551 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3552 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3553 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3554 $pl->valid or next;
3555 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3556 $pl->save;
3270 } 3557 }
3271 warn "end emergency player save\n"; 3558 warn "end emergency player save\n";
3272 3559
3273 warn "begin emergency map save\n"; 3560 warn "begin emergency map save\n";
3279 warn "end emergency map save\n"; 3566 warn "end emergency map save\n";
3280 3567
3281 warn "begin emergency database checkpoint\n"; 3568 warn "begin emergency database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3569 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3570 warn "end emergency database checkpoint\n";
3571
3572 warn "begin write uuid\n";
3573 write_uuid_sync 1;
3574 warn "end write uuid\n";
3284 }; 3575 };
3285 3576
3286 warn "leave emergency perl save\n"; 3577 warn "leave emergency perl save\n";
3287} 3578}
3288 3579
3303 warn "reloading..."; 3594 warn "reloading...";
3304 3595
3305 warn "entering sync_job"; 3596 warn "entering sync_job";
3306 3597
3307 cf::sync_job { 3598 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3309 cf::emergency_save; 3600 cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3311 3602
3312 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3605
3315 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
3316
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321 3607
3322 warn "flushing outstanding aio requests"; 3608 warn "flushing outstanding aio requests";
3323 for (;;) { 3609 for (;;) {
3324 BDB::flush; 3610 BDB::flush;
3325 IO::AIO::flush; 3611 IO::AIO::flush;
3326 Coro::cede; 3612 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3613 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3614 warn "iterate...";
3329 } 3615 }
3330 3616
3331 ++$RELOAD; 3617 ++$RELOAD;
3407 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3408 3694
3409 1 3695 1
3410 } or do { 3696 } or do {
3411 warn $@; 3697 warn $@;
3412 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3699 };
3415 3700
3416 warn "reloaded"; 3701 warn "reloaded";
3417}; 3702};
3418 3703
3420 3705
3421sub reload_perl() { 3706sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3707 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3708 # coro crashes during coro_state_free->destroy here.
3424 3709
3425 $RELOAD_WATCHER ||= Event->timer ( 3710 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl; 3711 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3712 undef $RELOAD_WATCHER;
3432 },
3433 ); 3713 };
3434} 3714}
3435 3715
3436register_command "reload" => sub { 3716register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3717 my ($who, $arg) = @_;
3438 3718
3439 if ($who->flag (FLAG_WIZ)) { 3719 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3720 $who->message ("reloading server.");
3721 async {
3722 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3723 reload_perl;
3724 };
3442 } 3725 }
3443}; 3726};
3444 3727
3445unshift @INC, $LIBDIR; 3728unshift @INC, $LIBDIR;
3446 3729
3448 3731
3449our @WAIT_FOR_TICK; 3732our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3733our @WAIT_FOR_TICK_BEGIN;
3451 3734
3452sub wait_for_tick { 3735sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3455 3737
3456 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3739 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3740 $signal->wait;
3459} 3741}
3460 3742
3461sub wait_for_tick_begin { 3743sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 3744 return if tick_inhibit || $Coro::current == $Coro::main;
3464 3745
3465 my $signal = new Coro::Signal; 3746 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3747 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3748 $signal->wait;
3468} 3749}
3469 3750
3470$TICK_WATCHER = Event->timer ( 3751sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3752 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3753 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3754 unless ++$bug_warning > 10;
3480 return; 3755 return;
3481 } 3756 }
3482 3757
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3758 cf::server_tick; # one server iteration
3486 3759
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3760 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3762 Coro::async_pool {
3763 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3764 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3765 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3766 };
3767 }
3497 3768
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3769 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3770 $sig->send;
3500 } 3771 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3772 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3773 $sig->send;
3503 } 3774 }
3504 3775
3505 $NOW = Event::time; 3776 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3777 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3778
3516 _post_tick; 3779 if (0) {
3780 if ($NEXT_TICK) {
3781 my $jitter = $TICK_START - $NEXT_TICK;
3782 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3783 warn "jitter $JITTER\n";#d#
3784 }
3517 }, 3785 }
3518); 3786}
3519 3787
3520{ 3788{
3789 # configure BDB
3790
3521 BDB::min_parallel 8; 3791 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3792 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3793 $AnyEvent::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3794
3547 unless ($DB_ENV) { 3795 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3796 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1); 3798 | BDB::LOG_AUTOREMOVE, 1);
3565 3813
3566 cf::cleanup "db_env_open(db): $@" if $@; 3814 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3815 };
3568 } 3816 }
3569 3817
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3818 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3819 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 3820 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3821 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3822 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3823 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3824 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3825 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3826 };
3600} 3827}
3601 3828
3602{ 3829{
3830 # configure IO::AIO
3831
3603 IO::AIO::min_parallel 8; 3832 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3833 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3834 $AnyEvent::AIO::WATCHER->priority (1);
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3835}
3616 3836
3617my $_log_backtrace; 3837my $_log_backtrace;
3618 3838
3619sub _log_backtrace { 3839sub _log_backtrace {
3623 3843
3624 # limit the # of concurrent backtraces 3844 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3845 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3846 ++$_log_backtrace;
3627 async { 3847 async {
3848 $Coro::current->{desc} = "abt $msg";
3849
3628 my @bt = fork_call { 3850 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3851 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3852 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3853 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3854 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines