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.430 by root, Sun May 4 14:12:37 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines