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.481 by root, Sun Oct 11 00:24:35 2009 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
77# strictly for debugging 79# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 81
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 83
84our @ORIG_INC;
85
82our %COMMAND = (); 86our %COMMAND = ();
83our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
84 88
85our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
87our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
90 96
91our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 98our @EVENT;
93our @REFLECT; # set by XS 99our @REFLECT; # set by XS
94our %REFLECT; # set by us 100our %REFLECT; # set by us
95 101
96our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
97our $DATADIR = datadir; 104our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
101our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 117
110our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
111 125
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 128our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 134our $DB_ENV;
121 135
122our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 137
124our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
125 140
126our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
128our $NOW; 144our $NOW;
129 145
130our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
141 157
142our @POST_INIT; 158our @POST_INIT;
143 159
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
146 165
147binmode STDOUT; 166binmode STDOUT;
148binmode STDERR; 167binmode STDERR;
149 168
150# read virtual server time, if available 169# read virtual server time, if available
161 180
162our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
163 182
164sub cf::map::normalise; 183sub cf::map::normalise;
165 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
166############################################################################# 189#############################################################################
167 190
168%REFLECT = (); 191%REFLECT = ();
169for (@REFLECT) { 192for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 193 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 194 $REFLECT{$reflect->{class}} = $reflect;
172} 195}
173 196
174# this is decidedly evil 197# this is decidedly evil
175$REFLECT{object}{flags} = { map $_ => undef, grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} }; 198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 199
177############################################################################# 200#############################################################################
178 201
179=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
180 203
181=over 4 204=over 4
182 205
183=item $cf::UPTIME 206=item $cf::UPTIME
184 207
185The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
186 224
187=item $cf::RUNTIME 225=item $cf::RUNTIME
188 226
189The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
190every server tick. 228every server tick.
191 229
192=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
193$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
194$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
195 233
196Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
197directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
199database environment. 237database environment.
200 238
201=item $cf::NOW
202
203The time of the last (current) server tick.
204
205=item $cf::TICK
206
207The interval between server ticks, in seconds.
208
209=item $cf::LOADAVG 239=item $cf::LOADAVG
210 240
211The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
212(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
213objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
222from wherever your confdir points to. 252from wherever your confdir points to.
223 253
224=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
225 255
226These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
227returns directly I<after> the tick processing (and consequently, can only wake one process 257returns directly I<after> the tick processing (and consequently, can only wake one thread
228per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 258per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229 259
260Note that cf::Wait_for_tick will immediately return when the server is not
261ticking, making it suitable for small pauses in threads that need to run
262when the server is paused. If that is not applicable (i.e. you I<really>
263want to wait, use C<$cf::WAIT_FOR_TICK>).
264
265=item $cf::WAIT_FOR_TICK
266
267Note that C<cf::wait_for_tick> is probably the correct thing to use. This
268variable contains a L<Coro::Signal> that is broadcats after every server
269tick. Calling C<< ->wait >> on it will suspend the caller until after the
270next server tick.
271
272=cut
273
274sub wait_for_tick();
275sub wait_for_tick_begin();
276
230=item @cf::INVOKE_RESULTS 277=item @cf::INVOKE_RESULTS
231 278
232This array contains the results of the last C<invoke ()> call. When 279This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 280C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 281that call.
235 282
236=item %cf::REFLECT 283=item %cf::REFLECT
237 284
241 288
242=back 289=back
243 290
244=cut 291=cut
245 292
293sub error(@) { LOG llevError, join "", @_ }
294sub warn (@) { LOG llevWarn , join "", @_ }
295sub info (@) { LOG llevInfo , join "", @_ }
296sub debug(@) { LOG llevDebug, join "", @_ }
297sub trace(@) { LOG llevTrace, join "", @_ }
298
246$Coro::State::WARNHOOK = sub { 299$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 300 my $msg = join "", @_;
248 301
249 $msg .= "\n" 302 $msg .= "\n"
250 unless $msg =~ /\n$/; 303 unless $msg =~ /\n$/;
251 304
252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 305 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253 306
254 LOG llevError, $msg; 307 LOG llevWarn, $msg;
255}; 308};
256 309
257$Coro::State::DIEHOOK = sub { 310$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 311 return unless $^S eq 0; # "eq", not "=="
259 312
260 warn Carp::longmess $_[0]; 313 error Carp::longmess $_[0];
261 314
262 if ($Coro::current == $Coro::main) {#d# 315 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 316 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 317 return;#d#
265 }#d# 318 }#d#
266 319
267 # kill coroutine otherwise 320 # kill coroutine otherwise
268 Coro::terminate 321 Coro::terminate
288)) { 341)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 342 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 343}
291 344
292$EV::DIED = sub { 345$EV::DIED = sub {
293 warn "error in event callback: @_"; 346 warn "error in event callback: $@";
294}; 347};
348
349#############################################################################
350
351sub fork_call(&@);
352sub get_slot($;$$);
295 353
296############################################################################# 354#############################################################################
297 355
298=head2 UTILITY FUNCTIONS 356=head2 UTILITY FUNCTIONS
299 357
320 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 378 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
321 $d 379 $d
322 } || "[unable to dump $_[0]: '$@']"; 380 } || "[unable to dump $_[0]: '$@']";
323} 381}
324 382
383=item $scalar = cf::load_file $path
384
385Loads the given file from path and returns its contents. Croaks on error
386and can block.
387
388=cut
389
390sub load_file($) {
391 0 <= aio_load $_[0], my $data
392 or Carp::croak "$_[0]: $!";
393
394 $data
395}
396
397=item $success = cf::replace_file $path, $data, $sync
398
399Atomically replaces the file at the given $path with new $data, and
400optionally $sync the data to disk before replacing the file.
401
402=cut
403
404sub replace_file($$;$) {
405 my ($path, $data, $sync) = @_;
406
407 my $lock = cf::lock_acquire ("replace_file:$path");
408
409 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
410 or return;
411
412 $data = $data->() if ref $data;
413
414 length $data == aio_write $fh, 0, (length $data), $data, 0
415 or return;
416
417 !$sync
418 or !aio_fsync $fh
419 or return;
420
421 aio_close $fh
422 and return;
423
424 aio_rename "$path~", $path
425 and return;
426
427 if ($sync) {
428 $path =~ s%/[^/]*$%%;
429 aio_pathsync $path;
430 }
431
432 1
433}
434
325=item $ref = cf::decode_json $json 435=item $ref = cf::decode_json $json
326 436
327Converts a JSON string into the corresponding perl data structure. 437Converts a JSON string into the corresponding perl data structure.
328 438
329=item $json = cf::encode_json $ref 439=item $json = cf::encode_json $ref
335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 445our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336 446
337sub encode_json($) { $json_coder->encode ($_[0]) } 447sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 448sub decode_json($) { $json_coder->decode ($_[0]) }
339 449
450=item $ref = cf::decode_storable $scalar
451
452Same as Coro::Storable::thaw, so blocks.
453
454=cut
455
456BEGIN { *decode_storable = \&Coro::Storable::thaw }
457
458=item $ref = cf::decode_yaml $scalar
459
460Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
461
462=cut
463
464sub decode_yaml($) {
465 fork_call { YAML::XS::Load $_[0] } @_
466}
467
468=item $scalar = cf::unlzf $scalar
469
470Same as Compress::LZF::compress, but takes server ticks into account, so
471blocks.
472
473=cut
474
475sub unlzf($) {
476 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
477 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
478 Compress::LZF::decompress $_[0]
479}
480
340=item cf::post_init { BLOCK } 481=item cf::post_init { BLOCK }
341 482
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 483Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 484but I<before> the server starts ticking again.
344 485
345The cdoeblock will have a single boolean argument to indicate whether this 486The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 487is a reload or not.
347 488
348=cut 489=cut
349 490
350sub post_init(&) { 491sub post_init(&) {
351 push @POST_INIT, shift; 492 push @POST_INIT, shift;
493}
494
495sub _post_init {
496 trace "running post_init jobs";
497
498 # run them in parallel...
499
500 my @join;
501
502 while () {
503 push @join, map &Coro::async ($_, 0), @POST_INIT;
504 @POST_INIT = ();
505
506 @join or last;
507
508 (pop @join)->join;
509 }
352} 510}
353 511
354=item cf::lock_wait $string 512=item cf::lock_wait $string
355 513
356Wait until the given lock is available. See cf::lock_acquire. 514Wait until the given lock is available. See cf::lock_acquire.
395} 553}
396 554
397=item cf::periodic $interval, $cb 555=item cf::periodic $interval, $cb
398 556
399Like EV::periodic, but randomly selects a starting point so that the actions 557Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 558get spread over time.
401 559
402=cut 560=cut
403 561
404sub periodic($$) { 562sub periodic($$) {
405 my ($interval, $cb) = @_; 563 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 567 EV::periodic $start, $interval, 0, $cb
410} 568}
411 569
412=item cf::get_slot $time[, $priority[, $name]] 570=item cf::get_slot $time[, $priority[, $name]]
413 571
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 572Allocate $time seconds of blocking CPU time at priority C<$priority>
415This call blocks and returns only when you have at least C<$time> seconds 573(default: 0): This call blocks and returns only when you have at least
416of cpu time till the next tick. The slot is only valid till the next cede. 574C<$time> seconds of cpu time till the next tick. The slot is only valid
575till the next cede.
576
577Background jobs should use a priority les than zero, interactive jobs
578should use 100 or more.
417 579
418The optional C<$name> can be used to identify the job to run. It might be 580The optional C<$name> can be used to identify the job to run. It might be
419used for statistical purposes and should identify the same time-class. 581used for statistical purposes and should identify the same time-class.
420 582
421Useful for short background jobs. 583Useful for short background jobs.
422 584
423=cut 585=cut
424 586
425our @SLOT_QUEUE; 587our @SLOT_QUEUE;
426our $SLOT_QUEUE; 588our $SLOT_QUEUE;
589our $SLOT_DECAY = 0.9;
427 590
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 591$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 592$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 593 $Coro::current->desc ("timeslot manager");
431 594
432 my $signal = new Coro::Signal; 595 my $signal = new Coro::Signal;
596 my $busy;
433 597
434 while () { 598 while () {
435 next_job: 599 next_job:
600
436 my $avail = cf::till_tick; 601 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 602
438 for (0 .. $#SLOT_QUEUE) { 603 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 604 if ($SLOT_QUEUE[$_][0] <= $avail) {
605 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 606 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 607 $job->[2]->send;
442 Coro::cede; 608 Coro::cede;
443 goto next_job; 609 goto next_job;
444 } 610 } else {
611 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 612 }
446 } 613 }
447 614
448 if (@SLOT_QUEUE) { 615 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 616 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 617 $WAIT_FOR_TICK->wait;
451 $signal->wait;
452 } else { 618 } else {
619 $busy = 0;
453 Coro::schedule; 620 Coro::schedule;
454 } 621 }
455 } 622 }
456}; 623};
457 624
458sub get_slot($;$$) { 625sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 626 return if tick_inhibit || $Coro::current == $Coro::main;
460 627
461 my ($time, $pri, $name) = @_; 628 my ($time, $pri, $name) = @_;
462 629
463 $time = $TICK * .6 if $time > $TICK * .6; 630 $time = clamp $time, 0.01, $TICK * .6;
631
464 my $sig = new Coro::Signal; 632 my $sig = new Coro::Signal;
465 633
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 634 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 635 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 636 $SLOT_QUEUE->ready;
494=cut 662=cut
495 663
496sub sync_job(&) { 664sub sync_job(&) {
497 my ($job) = @_; 665 my ($job) = @_;
498 666
499 if ($Coro::current == $Coro::main) { 667 if (in_main) {
500 my $time = EV::time; 668 my $time = AE::time;
501 669
502 # this is the main coro, too bad, we have to block 670 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 671 # till the operation succeeds, freezing the server :/
504 672
505 LOG llevError, Carp::longmess "sync job";#d# 673 #LOG llevError, Carp::longmess "sync job";#d#
506 674
507 my $freeze_guard = freeze_mainloop; 675 my $freeze_guard = freeze_mainloop;
508 676
509 my $busy = 1; 677 my $busy = 1;
510 my @res; 678 my @res;
511 679
512 (async { 680 (async {
513 $Coro::current->desc ("sync job coro"); 681 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 682 @res = eval { $job->() };
515 warn $@ if $@; 683 error $@ if $@;
516 undef $busy; 684 undef $busy;
517 })->prio (Coro::PRIO_MAX); 685 })->prio (Coro::PRIO_MAX);
518 686
519 while ($busy) { 687 while ($busy) {
520 if (Coro::nready) { 688 if (Coro::nready) {
522 } else { 690 } else {
523 EV::loop EV::LOOP_ONESHOT; 691 EV::loop EV::LOOP_ONESHOT;
524 } 692 }
525 } 693 }
526 694
527 my $time = EV::time - $time; 695 my $time = AE::time - $time;
528 696
529 $TICK_START += $time; # do not account sync jobs to server load 697 $TICK_START += $time; # do not account sync jobs to server load
530 698
531 wantarray ? @res : $res[0] 699 wantarray ? @res : $res[0]
532 } else { 700 } else {
554 $EXT_CORO{$coro+0} = $coro; 722 $EXT_CORO{$coro+0} = $coro;
555 723
556 $coro 724 $coro
557} 725}
558 726
559=item fork_call { }, $args 727=item fork_call { }, @args
560 728
561Executes the given code block with the given arguments in a seperate 729Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 730process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 731Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 732never block itself or use any form of event handling.
565 733
566=cut 734=cut
567 735
736sub post_fork {
737 reset_signals;
738}
739
568sub fork_call(&@) { 740sub fork_call(&@) {
569 my ($cb, @args) = @_; 741 my ($cb, @args) = @_;
570 742
571 # we seemingly have to make a local copy of the whole thing, 743 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/ 744 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 745 # TODO: investigate and fix (likely this will be rather laborious)
574 746
575 my @res = Coro::Util::fork_eval { 747 my @res = Coro::Util::fork_eval {
576 reset_signals; 748 cf::post_fork;
577 &$cb 749 &$cb
578 }, @args; 750 } @args;
579 751
580 wantarray ? @res : $res[-1] 752 wantarray ? @res : $res[-1]
753}
754
755sub objinfo {
756 (
757 "counter value" => cf::object::object_count,
758 "objects created" => cf::object::create_count,
759 "objects destroyed" => cf::object::destroy_count,
760 "freelist size" => cf::object::free_count,
761 "allocated objects" => cf::object::objects_size,
762 "active objects" => cf::object::actives_size,
763 )
581} 764}
582 765
583=item $coin = coin_from_name $name 766=item $coin = coin_from_name $name
584 767
585=cut 768=cut
622within each server. 805within each server.
623 806
624=cut 807=cut
625 808
626sub db_table($) { 809sub db_table($) {
810 cf::error "db_get called from main context"
811 if $Coro::current == $Coro::main;
812
627 my ($name) = @_; 813 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 814 my $db = BDB::db_create $DB_ENV;
629 815
630 eval { 816 eval {
631 $db->set_flags (BDB::CHKSUM); 817 $db->set_flags (BDB::CHKSUM);
641} 827}
642 828
643our $DB; 829our $DB;
644 830
645sub db_init { 831sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 832 $DB ||= db_table "db";
648 };
649} 833}
650 834
651sub db_get($$) { 835sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 836 my $key = "$_[0]/$_[1]";
653 837
654 cf::sync_job { 838 cf::error "db_get called from main context"
839 if $Coro::current == $Coro::main;
840
655 BDB::db_get $DB, undef, $key, my $data; 841 BDB::db_get $DB, undef, $key, my $data;
656 842
657 $! ? () 843 $! ? ()
658 : $data 844 : $data
659 }
660} 845}
661 846
662sub db_put($$$) { 847sub db_put($$$) {
663 BDB::dbreq_pri 4; 848 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 849 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 877
693 my @data; 878 my @data;
694 my $md5; 879 my $md5;
695 880
696 for (0 .. $#$src) { 881 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 882 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 883 }
700 884
701 # if processing is expensive, check 885 # if processing is expensive, check
702 # checksum first 886 # checksum first
703 if (1) { 887 if (1) {
716 900
717 return db_get cache => "$id/data"; 901 return db_get cache => "$id/data";
718 } 902 }
719 } 903 }
720 904
721 my $t1 = Time::HiRes::time; 905 my $t1 = EV::time;
722 my $data = $process->(\@data); 906 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 907 my $t2 = EV::time;
724 908
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 909 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 910
727 db_put cache => "$id/data", $data; 911 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 912 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 913 db_put cache => "$id/meta", $meta;
730 914
740 924
741=cut 925=cut
742 926
743sub datalog($@) { 927sub datalog($@) {
744 my ($type, %kv) = @_; 928 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 929 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 930}
747 931
748=back 932=back
749 933
750=cut 934=cut
945 1129
946 } elsif (exists $cb_id{$type}) { 1130 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1131 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1132
949 } elsif (ref $type) { 1133 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1134 error "attaching objects not supported, ignoring.\n";
951 1135
952 } else { 1136 } else {
953 shift @arg; 1137 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1138 error "attach argument '$type' not supported, ignoring.\n";
955 } 1139 }
956 } 1140 }
957} 1141}
958 1142
959sub _object_attach { 1143sub _object_attach {
969 _attach $registry, $klass, @attach; 1153 _attach $registry, $klass, @attach;
970 } 1154 }
971 1155
972 $obj->{$name} = \%arg; 1156 $obj->{$name} = \%arg;
973 } else { 1157 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1158 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1159 }
976 1160
977 $obj->{_attachment}{$name} = undef; 1161 $obj->{_attachment}{$name} = undef;
978} 1162}
979 1163
1038 1222
1039 for (@$callbacks) { 1223 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1224 eval { &{$_->[1]} };
1041 1225
1042 if ($@) { 1226 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1227 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1228 override;
1046 } 1229 }
1047 1230
1048 return 1 if $override; 1231 return 1 if $override;
1049 } 1232 }
1128 for (@$attach) { 1311 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1312 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1313 _attach $registry, $klass, @attach;
1131 } 1314 }
1132 } else { 1315 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1316 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1317 }
1135 } 1318 }
1136} 1319}
1137 1320
1138cf::attachable->attach ( 1321cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1348 my ($filename, $rdata, $objs) = @_;
1166 1349
1167 sync_job { 1350 sync_job {
1168 if (length $$rdata) { 1351 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1352 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1353 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1354 $decname, length $$rdata, scalar @$objs
1355 if $VERBOSE_IO;
1172 1356
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1357 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1358 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1359 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1360 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1382 aio_rename "$filename~", $filename;
1199 1383
1200 $filename =~ s%/[^/]+$%%; 1384 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1385 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1386 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1387 error "unable to save objects: $filename~: $!\n";
1204 } 1388 }
1205 } else { 1389 } else {
1206 aio_unlink $filename; 1390 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1208 } 1392 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1416 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1417 $av = $st->{objs};
1234 } 1418 }
1235 1419
1236 utf8::decode (my $decname = $filename); 1420 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1421 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1422 $decname, length $data, scalar @{$av || []}
1423 if $VERBOSE_IO;
1239 1424
1240 ($data, $av) 1425 ($data, $av)
1241} 1426}
1242 1427
1243=head2 COMMAND CALLBACKS 1428=head2 COMMAND CALLBACKS
1247=cut 1432=cut
1248 1433
1249############################################################################# 1434#############################################################################
1250# command handling &c 1435# command handling &c
1251 1436
1252=item cf::register_command $name => \&callback($ob,$args); 1437=item cf::register_command $name => \&callback($ob,$args)
1253 1438
1254Register a callback for execution when the client sends the user command 1439Register a callback for execution when the client sends the user command
1255$name. 1440$name.
1256 1441
1257=cut 1442=cut
1263 #warn "registering command '$name/$time' to '$caller'"; 1448 #warn "registering command '$name/$time' to '$caller'";
1264 1449
1265 push @{ $COMMAND{$name} }, [$caller, $cb]; 1450 push @{ $COMMAND{$name} }, [$caller, $cb];
1266} 1451}
1267 1452
1268=item cf::register_extcmd $name => \&callback($pl,$packet); 1453=item cf::register_extcmd $name => \&callback($pl,@args)
1269 1454
1270Register a callback for execution when the client sends an (synchronous) 1455Register a callback for execution when the client sends an (synchronous)
1271extcmd packet. Ext commands will be processed in the order they are 1456extcmd packet. Ext commands will be processed in the order they are
1272received by the server, like other user commands. The first argument is 1457received by the server, like other user commands. The first argument is
1273the logged-in player. Ext commands can only be processed after a player 1458the logged-in player. Ext commands can only be processed after a player
1274has logged in successfully. 1459has logged in successfully.
1275 1460
1276If the callback returns something, it is sent back as if reply was being 1461The values will be sent back to the client.
1277called.
1278 1462
1463=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1464
1465Same as C<cf::register_extcmd>, but instead of returning values, the
1466callback needs to clal the C<$reply> function.
1467
1279=item cf::register_exticmd $name => \&callback($ns,$packet); 1468=item cf::register_exticmd $name => \&callback($ns,@args)
1280 1469
1281Register a callback for execution when the client sends an (asynchronous) 1470Register a callback for execution when the client sends an (asynchronous)
1282exticmd packet. Exti commands are processed by the server as soon as they 1471exticmd packet. Exti commands are processed by the server as soon as they
1283are received, i.e. out of order w.r.t. other commands. The first argument 1472are received, i.e. out of order w.r.t. other commands. The first argument
1284is a client socket. Exti commands can be received anytime, even before 1473is a client socket. Exti commands can be received anytime, even before
1285log-in. 1474log-in.
1286 1475
1287If the callback returns something, it is sent back as if reply was being 1476The values will be sent back to the client.
1288called.
1289 1477
1290=cut 1478=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1291 1479
1480Same as C<cf::register_extcmd>, but instead of returning values, the
1481callback needs to clal the C<$reply> function.
1482
1483=cut
1484
1292sub register_extcmd { 1485sub register_extcmd($$) {
1293 my ($name, $cb) = @_; 1486 my ($name, $cb) = @_;
1294 1487
1295 $EXTCMD{$name} = $cb; 1488 $EXTCMD{$name} = $cb;
1296} 1489}
1297 1490
1298sub register_exticmd { 1491sub register_async_extcmd($$) {
1299 my ($name, $cb) = @_; 1492 my ($name, $cb) = @_;
1300 1493
1494 $EXTACMD{$name} = $cb;
1495}
1496
1497sub register_exticmd($$) {
1498 my ($name, $cb) = @_;
1499
1301 $EXTICMD{$name} = $cb; 1500 $EXTICMD{$name} = $cb;
1302} 1501}
1303 1502
1503sub register_async_exticmd($$) {
1504 my ($name, $cb) = @_;
1505
1506 $EXTIACMD{$name} = $cb;
1507}
1508
1304use File::Glob (); 1509use File::Glob ();
1305 1510
1306cf::player->attach ( 1511cf::player->attach (
1307 on_command => sub { 1512 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1513 my ($pl, $name, $params) = @_;
1309 1514
1310 my $cb = $COMMAND{$name} 1515 my $cb = $COMMAND{$name}
1311 or return; 1516 or return;
1312 1517
1320 my ($pl, $buf) = @_; 1525 my ($pl, $buf) = @_;
1321 1526
1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1527 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1323 1528
1324 if (ref $msg) { 1529 if (ref $msg) {
1325 my ($type, $reply, @payload) = 1530 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329 1531
1330 my @reply;
1331
1332 if (my $cb = $EXTCMD{$type}) { 1532 if (my $cb = $EXTACMD{$type}) {
1533 $cb->(
1534 $pl,
1535 sub {
1536 $pl->ext_msg ("reply-$reply", @_)
1537 if $reply;
1538 },
1539 @payload
1540 );
1541 } else {
1542 my @reply;
1543
1544 if (my $cb = $EXTCMD{$type}) {
1333 @reply = $cb->($pl, @payload); 1545 @reply = $cb->($pl, @payload);
1546 }
1547
1548 $pl->ext_msg ("reply-$reply", @reply)
1549 if $reply;
1334 } 1550 }
1335 1551
1336 $pl->ext_reply ($reply, @reply)
1337 if $reply;
1338
1339 } else { 1552 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1553 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1554 }
1342 1555
1343 cf::override; 1556 cf::override;
1344 }, 1557 },
1345); 1558);
1355 }; 1568 };
1356 1569
1357 $grp 1570 $grp
1358} 1571}
1359 1572
1573sub _ext_cfg_reg($$$$) {
1574 my ($rvar, $varname, $cfgname, $default) = @_;
1575
1576 $cfgname = lc $varname
1577 unless length $cfgname;
1578
1579 $EXT_CFG{$cfgname} = [$rvar, $default];
1580
1581 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1582}
1583
1360sub load_extensions { 1584sub load_extensions {
1585 info "loading extensions...";
1586
1587 %EXT_CFG = ();
1588
1361 cf::sync_job { 1589 cf::sync_job {
1362 my %todo; 1590 my %todo;
1363 1591
1364 for my $path (<$LIBDIR/*.ext>) { 1592 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1593 next unless -r $path;
1383 1611
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1612 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1613 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1614
1387 $ext{source} = 1615 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1616 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1617 . "#line 1 \"$path\"\n{\n"
1390 . $source 1618 . $source
1391 . "\n};\n1"; 1619 . "\n};\n1";
1392 1620
1393 $todo{$base} = \%ext; 1621 $todo{$base} = \%ext;
1394 } 1622 }
1395 1623
1624 my $pass = 0;
1396 my %done; 1625 my %done;
1397 while (%todo) { 1626 while (%todo) {
1398 my $progress; 1627 my $progress;
1399 1628
1629 ++$pass;
1630
1631 ext:
1400 while (my ($k, $v) = each %todo) { 1632 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1633 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1634 next ext
1403 unless exists $done{$_}; 1635 unless exists $done{$_};
1404 } 1636 }
1405 1637
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1638 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1639
1408 unless (eval $v->{source}) { 1640 my $source = $v->{source};
1641
1642 # support "CONF varname :confname = default" pseudo-statements
1643 $source =~ s{
1644 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1645 }{
1646 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1647 }gmxe;
1648
1649 my $active = eval $source;
1650
1651 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1652 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1653
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1654 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1655 if exists $v->{meta}{mandatory};
1416 1656
1417 warn $msg; 1657 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1658 delete $todo{$k};
1659 } else {
1660 $done{$k} = delete $todo{$k};
1661 push @EXTS, $v->{pkg};
1662 $progress = 1;
1663
1664 info "$v->{base}: extension inactive.\n"
1665 unless $active;
1418 } 1666 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1667 }
1424 1668
1425 skip: 1669 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1670 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1671
1672 while (my ($k, $v) = each %todo) {
1673 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1674 if exists $v->{meta}{mandatory};
1675 }
1676
1677 last;
1678 }
1428 } 1679 }
1429 }; 1680 };
1430} 1681}
1431 1682
1432############################################################################# 1683#############################################################################
1516 $cf::PLAYER{$login} = $pl 1767 $cf::PLAYER{$login} = $pl
1517 } 1768 }
1518 } 1769 }
1519} 1770}
1520 1771
1772cf::player->attach (
1773 on_load => sub {
1774 my ($pl, $path) = @_;
1775
1776 # restore slots saved in save, below
1777 my $slots = delete $pl->{_slots};
1778
1779 $pl->ob->current_weapon ($slots->[0]);
1780 $pl->combat_ob ($slots->[1]);
1781 $pl->ranged_ob ($slots->[2]);
1782 },
1783);
1784
1521sub save($) { 1785sub save($) {
1522 my ($pl) = @_; 1786 my ($pl) = @_;
1523 1787
1524 return if $pl->{deny_save}; 1788 return if $pl->{deny_save};
1525 1789
1530 1794
1531 aio_mkdir playerdir $pl, 0770; 1795 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1796 $pl->{last_save} = $cf::RUNTIME;
1533 1797
1534 cf::get_slot 0.01; 1798 cf::get_slot 0.01;
1799
1800 # save slots, to be restored later
1801 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1802
1536 $pl->save_pl ($path); 1803 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1804 cf::cede_to_tick;
1538} 1805}
1539 1806
1573 my $name = $pl->ob->name; 1840 my $name = $pl->ob->name;
1574 1841
1575 $pl->{deny_save} = 1; 1842 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1843 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1844
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1845 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1846 $pl->deactivate;
1847
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1848 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1849 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1850 ext::highscore::check ($pl->ob);
1851
1583 $pl->ns->destroy if $pl->ns; 1852 $pl->ns->destroy if $pl->ns;
1584 1853
1585 my $path = playerdir $pl; 1854 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1855 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1856 aio_rename $path, $temp;
1641 \@logins 1910 \@logins
1642} 1911}
1643 1912
1644=item $player->maps 1913=item $player->maps
1645 1914
1915=item cf::player::maps $login
1916
1646Returns an arrayref of map paths that are private for this 1917Returns an arrayref of map paths that are private for this
1647player. May block. 1918player. May block.
1648 1919
1649=cut 1920=cut
1650 1921
1671 1942
1672=item $protocol_xml = $player->expand_cfpod ($cfpod) 1943=item $protocol_xml = $player->expand_cfpod ($cfpod)
1673 1944
1674Expand deliantra pod fragments into protocol xml. 1945Expand deliantra pod fragments into protocol xml.
1675 1946
1676=item $player->ext_reply ($msgid, @msg)
1677
1678Sends an ext reply to the player.
1679
1680=cut
1681
1682sub ext_reply($$@) {
1683 my ($self, $id, @msg) = @_;
1684
1685 $self->ns->ext_reply ($id, @msg)
1686}
1687
1688=item $player->ext_msg ($type, @msg) 1947=item $player->ext_msg ($type, @msg)
1689 1948
1690Sends an ext event to the client. 1949Sends an ext event to the client.
1691 1950
1692=cut 1951=cut
1711 1970
1712=cut 1971=cut
1713 1972
1714sub find_by_path($) { 1973sub find_by_path($) {
1715 my ($path) = @_; 1974 my ($path) = @_;
1975
1976 $path =~ s/^~[^\/]*//; # skip ~login
1716 1977
1717 my ($match, $specificity); 1978 my ($match, $specificity);
1718 1979
1719 for my $region (list) { 1980 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1981 if ($region->{match} && $path =~ $region->{match}) {
1749sub generate_random_map { 2010sub generate_random_map {
1750 my ($self, $rmp) = @_; 2011 my ($self, $rmp) = @_;
1751 2012
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2013 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 2014
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 2015 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 2016}
1769 2017
1770=item cf::map->register ($regex, $prio) 2018=item cf::map->register ($regex, $prio)
1771 2019
1772Register a handler for the map path matching the given regex at the 2020Register a handler for the map path matching the given regex at the
1777 2025
1778sub register { 2026sub register {
1779 my (undef, $regex, $prio) = @_; 2027 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 2028 my $pkg = caller;
1781 2029
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 2030 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 2031
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2032 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 2033}
1787 2034
1788# also paths starting with '/' 2035# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2036$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 2037
1791sub thawer_merge { 2038sub thawer_merge {
1792 my ($self, $merge) = @_; 2039 my ($self, $merge) = @_;
1793 2040
1794 # we have to keep some variables in memory intact 2041 # we have to keep some variables in memory intact
1799} 2046}
1800 2047
1801sub normalise { 2048sub normalise {
1802 my ($path, $base) = @_; 2049 my ($path, $base) = @_;
1803 2050
1804 $path = "$path"; # make sure its a string 2051 $path = "$path"; # make sure it's a string
1805 2052
1806 $path =~ s/\.map$//; 2053 $path =~ s/\.map$//;
1807 2054
1808 # map plan: 2055 # map plan:
1809 # 2056 #
1824 $base =~ s{[^/]+/?$}{}; 2071 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 2072 $path = "$base/$path";
1826 } 2073 }
1827 2074
1828 for ($path) { 2075 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 2076 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 2077 redo if s{/[^/]+/\.\./}{/};
1832 } 2078 }
1833 2079
1834 $path 2080 $path
1848 $self->init; # pass $1 etc. 2094 $self->init; # pass $1 etc.
1849 return $self; 2095 return $self;
1850 } 2096 }
1851 } 2097 }
1852 2098
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2099 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2100 ()
1855} 2101}
1856 2102
2103# may re-bless or do other evil things
1857sub init { 2104sub init {
1858 my ($self) = @_; 2105 my ($self) = @_;
1859 2106
1860 $self 2107 $self
1861} 2108}
1926 $self->{load_path} = $path; 2173 $self->{load_path} = $path;
1927 2174
1928 1 2175 1
1929} 2176}
1930 2177
2178# used to laod the header of an original map
1931sub load_header_orig { 2179sub load_header_orig {
1932 my ($self) = @_; 2180 my ($self) = @_;
1933 2181
1934 $self->load_header_from ($self->load_path) 2182 $self->load_header_from ($self->load_path)
1935} 2183}
1936 2184
2185# used to laod the header of an instantiated map
1937sub load_header_temp { 2186sub load_header_temp {
1938 my ($self) = @_; 2187 my ($self) = @_;
1939 2188
1940 $self->load_header_from ($self->save_path) 2189 $self->load_header_from ($self->save_path)
1941} 2190}
1942 2191
2192# called after loading the header from an instantiated map
1943sub prepare_temp { 2193sub prepare_temp {
1944 my ($self) = @_; 2194 my ($self) = @_;
1945 2195
1946 $self->last_access ((delete $self->{last_access}) 2196 $self->last_access ((delete $self->{last_access})
1947 || $cf::RUNTIME); #d# 2197 || $cf::RUNTIME); #d#
1948 # safety 2198 # safety
1949 $self->{instantiate_time} = $cf::RUNTIME 2199 $self->{instantiate_time} = $cf::RUNTIME
1950 if $self->{instantiate_time} > $cf::RUNTIME; 2200 if $self->{instantiate_time} > $cf::RUNTIME;
1951} 2201}
1952 2202
2203# called after loading the header from an original map
1953sub prepare_orig { 2204sub prepare_orig {
1954 my ($self) = @_; 2205 my ($self) = @_;
1955 2206
1956 $self->{load_original} = 1; 2207 $self->{load_original} = 1;
1957 $self->{instantiate_time} = $cf::RUNTIME; 2208 $self->{instantiate_time} = $cf::RUNTIME;
1981 2232
1982sub find; 2233sub find;
1983sub find { 2234sub find {
1984 my ($path, $origin) = @_; 2235 my ($path, $origin) = @_;
1985 2236
2237 cf::cede_to_tick;
2238
1986 $path = normalise $path, $origin && $origin->path; 2239 $path = normalise $path, $origin;
1987 2240
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2241 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2242 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2243
1991 $cf::MAP{$path} || do { 2244 $cf::MAP{$path} || do {
2008 2261
2009 $cf::MAP{$path} = $map 2262 $cf::MAP{$path} = $map
2010 } 2263 }
2011} 2264}
2012 2265
2013sub pre_load { } 2266sub pre_load { }
2014sub post_load { } 2267#sub post_load { } # XS
2015 2268
2016sub load { 2269sub load {
2017 my ($self) = @_; 2270 my ($self) = @_;
2018 2271
2019 local $self->{deny_reset} = 1; # loading can take a long time 2272 local $self->{deny_reset} = 1; # loading can take a long time
2022 2275
2023 { 2276 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2277 my $guard = cf::lock_acquire "map_data:$path";
2025 2278
2026 return unless $self->valid; 2279 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2280 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2281
2031 $self->alloc; 2282 $self->alloc;
2032 2283
2033 $self->pre_load; 2284 $self->pre_load;
2034 cf::cede_to_tick; 2285 cf::cede_to_tick;
2035 2286
2287 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2288 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2289 $f->skip_block;
2038 $self->_load_objects ($f) 2290 $self->_load_objects ($f)
2039 or return; 2291 or return;
2040 2292
2041 $self->post_load_original 2293 $self->post_load_original
2042 if delete $self->{load_original}; 2294 if delete $self->{load_original};
2043 2295
2044 if (my $uniq = $self->uniq_path) { 2296 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2297 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2298 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2299 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2300 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2301 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2302 $f->resolve_delayed_derefs;
2303 }
2051 } 2304 }
2052 } 2305 }
2053 }
2054 2306
2055 $f->resolve_delayed_derefs; 2307 $f->resolve_delayed_derefs;
2308 } else {
2309 $self->post_load_original
2310 if delete $self->{load_original};
2311 }
2312
2313 $self->state (cf::MAP_INACTIVE);
2056 2314
2057 cf::cede_to_tick; 2315 cf::cede_to_tick;
2058 # now do the right thing for maps 2316 # now do the right thing for maps
2059 $self->link_multipart_objects; 2317 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2318 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2322 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2323 $self->decay_objects;
2066 $self->fix_auto_apply; 2324 $self->fix_auto_apply;
2067 $self->update_buttons; 2325 $self->update_buttons;
2068 cf::cede_to_tick; 2326 cf::cede_to_tick;
2069 $self->activate; 2327 #$self->activate; # no longer activate maps automatically
2070 } 2328 }
2071 2329
2072 $self->{last_save} = $cf::RUNTIME; 2330 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME); 2331 $self->last_access ($cf::RUNTIME);
2074
2075 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2332 }
2077 2333
2078 $self->post_load; 2334 $self->post_load;
2079}
2080 2335
2336 1
2337}
2338
2339# customize the map for a given player, i.e.
2340# return the _real_ map. used by e.g. per-player
2341# maps to change the path to ~playername/mappath
2081sub customise_for { 2342sub customise_for {
2082 my ($self, $ob) = @_; 2343 my ($self, $ob) = @_;
2083 2344
2084 return find "~" . $ob->name . "/" . $self->{path} 2345 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2346 if $self->per_player;
2088# if $self->per_party; 2349# if $self->per_party;
2089 2350
2090 $self 2351 $self
2091} 2352}
2092 2353
2093# find and load all maps in the 3x3 area around a map
2094sub load_neighbours {
2095 my ($map) = @_;
2096
2097 my @neigh; # diagonal neighbours
2098
2099 for (0 .. 3) {
2100 my $neigh = $map->tile_path ($_)
2101 or next;
2102 $neigh = find $neigh, $map
2103 or next;
2104 $neigh->load;
2105
2106 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 }
2110
2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
2113 my $neigh = find $path, $origin
2114 or next;
2115 $neigh->load;
2116 }
2117}
2118
2119sub find_sync { 2354sub find_sync {
2120 my ($path, $origin) = @_; 2355 my ($path, $origin) = @_;
2121 2356
2122 cf::sync_job { find $path, $origin } 2357 # it's a bug to call this from the main context
2358 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2359 if $Coro::current == $Coro::main;
2360
2361 find $path, $origin
2123} 2362}
2124 2363
2125sub do_load_sync { 2364sub do_load_sync {
2126 my ($map) = @_; 2365 my ($map) = @_;
2127 2366
2367 # it's a bug to call this from the main context
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2368 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2369 if $Coro::current == $Coro::main;
2130 2370
2131 cf::sync_job { $map->load }; 2371 $map->load;
2132} 2372}
2133 2373
2134our %MAP_PREFETCH; 2374our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2375our $MAP_PREFETCHER = undef;
2136 2376
2137sub find_async { 2377sub find_async {
2138 my ($path, $origin, $load) = @_; 2378 my ($path, $origin, $load) = @_;
2139 2379
2140 $path = normalise $path, $origin && $origin->{path}; 2380 $path = normalise $path, $origin;
2141 2381
2142 if (my $map = $cf::MAP{$path}) { 2382 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2383 return $map if !$load || $map->linkable;
2144 } 2384 }
2145 2385
2146 $MAP_PREFETCH{$path} |= $load; 2386 $MAP_PREFETCH{$path} |= $load;
2147 2387
2148 $MAP_PREFETCHER ||= cf::async { 2388 $MAP_PREFETCHER ||= cf::async {
2162 $MAP_PREFETCHER->prio (6); 2402 $MAP_PREFETCHER->prio (6);
2163 2403
2164 () 2404 ()
2165} 2405}
2166 2406
2407# common code, used by both ->save and ->swapout
2167sub save { 2408sub _save {
2168 my ($self) = @_; 2409 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2410
2172 $self->{last_save} = $cf::RUNTIME; 2411 $self->{last_save} = $cf::RUNTIME;
2173 2412
2174 return unless $self->dirty; 2413 return unless $self->dirty;
2175 2414
2195 } else { 2434 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2435 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2436 }
2198} 2437}
2199 2438
2439sub save {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 $self->_save;
2445}
2446
2200sub swap_out { 2447sub swap_out {
2201 my ($self) = @_; 2448 my ($self) = @_;
2202 2449
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2450 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2451
2452 return if !$self->linkable;
2453 return if $self->{deny_save};
2208 return if $self->players; 2454 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2455
2456 # first deactivate the map and "unlink" it from the core
2457 $self->deactivate;
2458 $_->clear_links_to ($self) for values %cf::MAP;
2459 $self->state (cf::MAP_SWAPPED);
2460
2461 # then atomically save
2462 $self->_save;
2463
2464 # then free the map
2465 $self->clear;
2466}
2467
2468sub reset_at {
2469 my ($self) = @_;
2470
2471 # TODO: safety, remove and allow resettable per-player maps
2210 return if $self->{deny_save}; 2472 return 1e99 if $self->{deny_reset};
2211 2473
2474 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2475 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2476
2477 $time + $to
2478}
2479
2480sub should_reset {
2481 my ($self) = @_;
2482
2483 $self->reset_at <= $cf::RUNTIME
2484}
2485
2486sub reset {
2487 my ($self) = @_;
2488
2489 my $lock = cf::lock_acquire "map_data:$self->{path}";
2490
2491 return if $self->players;
2492
2493 cf::trace "resetting map ", $self->path, "\n";
2494
2212 $self->in_memory (cf::MAP_SWAPPED); 2495 $self->state (cf::MAP_SWAPPED);
2496
2497 # need to save uniques path
2498 unless ($self->{deny_save}) {
2499 my $uniq = $self->uniq_path; utf8::encode $uniq;
2500
2501 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2502 if $uniq;
2503 }
2504
2505 delete $cf::MAP{$self->path};
2213 2506
2214 $self->deactivate; 2507 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2508 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2509 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2510
2262 $self->unlink_save; 2511 $self->unlink_save;
2263 $self->destroy; 2512 $self->destroy;
2264} 2513}
2265 2514
2273 2522
2274 delete $cf::MAP{$self->path}; 2523 delete $cf::MAP{$self->path};
2275 2524
2276 $self->unlink_save; 2525 $self->unlink_save;
2277 2526
2278 bless $self, "cf::map"; 2527 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2528 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2529 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2530 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2531 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2532
2340 : normalise $_ 2589 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2590 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2591 ]
2343} 2592}
2344 2593
2594=item cf::map::static_maps
2595
2596Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2597file in the shared directory excluding F</styles> and F</editor>). May
2598block.
2599
2600=cut
2601
2602sub static_maps() {
2603 my @dirs = "";
2604 my @maps;
2605
2606 while (@dirs) {
2607 my $dir = shift @dirs;
2608
2609 next if $dir eq "/styles" || $dir eq "/editor";
2610
2611 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2612 or return;
2613
2614 for (@$files) {
2615 s/\.map$// or next;
2616 utf8::decode $_;
2617 push @maps, "$dir/$_";
2618 }
2619
2620 push @dirs, map "$dir/$_", @$dirs;
2621 }
2622
2623 \@maps
2624}
2625
2345=back 2626=back
2346 2627
2347=head3 cf::object 2628=head3 cf::object
2348 2629
2349=cut 2630=cut
2481 2762
2482Freezes the player and moves him/her to a special map (C<{link}>). 2763Freezes the player and moves him/her to a special map (C<{link}>).
2483 2764
2484The player should be reasonably safe there for short amounts of time (e.g. 2765The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2766for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2767though, as the player cannot control the character while it is on the link
2487map. 2768map.
2488 2769
2489Will never block. 2770Will never block.
2490 2771
2491=item $player_object->leave_link ($map, $x, $y) 2772=item $player_object->leave_link ($map, $x, $y)
2512sub cf::object::player::enter_link { 2793sub cf::object::player::enter_link {
2513 my ($self) = @_; 2794 my ($self) = @_;
2514 2795
2515 $self->deactivate_recursive; 2796 $self->deactivate_recursive;
2516 2797
2798 ++$self->{_link_recursion};
2799
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2800 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2801
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2802 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2803 if $self->map && $self->map->{path} ne "{link}";
2521 2804
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2805 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2806}
2524 2807
2525sub cf::object::player::leave_link { 2808sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2809 my ($self, $map, $x, $y) = @_;
2527 2810
2544 ($x, $y) = (-1, -1) 2827 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2828 unless (defined $x) && (defined $y);
2546 2829
2547 # use -1 or undef as default coordinates, not 0, 0 2830 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2831 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2832 if $x <= 0 && $y <= 0;
2550 2833
2551 $map->load; 2834 $map->load;
2552 $map->load_neighbours;
2553 2835
2554 return unless $self->contr->active; 2836 return unless $self->contr->active;
2555 2837
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2838 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2839 if ($self->enter_map ($map, $x, $y)) {
2558 2840 # entering was successful
2841 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2842 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2843 $self->activate_recursive;
2561} 2844 }
2562 2845
2846}
2847
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2848=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2849
2565Moves the player to the given map-path and coordinates by first freezing 2850Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2851her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2852that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2853the new (success) or old (failed) map position. In either case, $done will
2575 2860
2576our $GOTOGEN; 2861our $GOTOGEN;
2577 2862
2578sub cf::object::player::goto { 2863sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2864 my ($self, $path, $x, $y, $check, $done) = @_;
2865
2866 if ($self->{_link_recursion} >= $MAX_LINKS) {
2867 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2868 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2869 ($path, $x, $y) = @$EMERGENCY_POSITION;
2870 }
2580 2871
2581 # do generation counting so two concurrent goto's will be executed in-order 2872 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2873 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2874
2584 $self->enter_link; 2875 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2895 ($path, $x, $y) = (undef, undef, undef);
2605 } 2896 }
2606 } 2897 }
2607 2898
2608 my $map = eval { 2899 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2900 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2901
2611 if ($map) { 2902 if ($map) {
2612 $map = $map->customise_for ($self); 2903 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2904 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2905 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2906 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2907 }
2617 2908
2618 $map 2909 $map
2626 if ($gen == $self->{_goto_generation}) { 2917 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2918 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2919 $self->leave_link ($map, $x, $y);
2629 } 2920 }
2630 2921
2631 $done->() if $done; 2922 $done->($self) if $done;
2632 })->prio (1); 2923 })->prio (1);
2633} 2924}
2634 2925
2635=item $player_object->enter_exit ($exit_object) 2926=item $player_object->enter_exit ($exit_object)
2636 2927
2704 $Coro::current->{desc} = "enter_exit"; 2995 $Coro::current->{desc} = "enter_exit";
2705 2996
2706 unless (eval { 2997 unless (eval {
2707 $self->deactivate_recursive; # just to be sure 2998 $self->deactivate_recursive; # just to be sure
2708 2999
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3000 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 3001 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp; 3002 my $y = $exit->stats->sp;
3003
3004 # special map handling
3005 my $slaying = $exit->slaying;
3006
3007 # special map handling
3008 if ($slaying eq "/!") {
3009 my $guard = cf::lock_acquire "exit_prepare:$exit";
3010
3011 prepare_random_map $exit
3012 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3013
3014 $map = $exit->slaying;
3015
3016 } elsif ($slaying eq '!up') {
3017 $map = $exit->map->tile_path (cf::TILE_UP);
3018 $x = $exit->x;
3019 $y = $exit->y;
3020
3021 } elsif ($slaying eq '!down') {
3022 $map = $exit->map->tile_path (cf::TILE_DOWN);
3023 $x = $exit->x;
3024 $y = $exit->y;
3025 }
2720 3026
2721 $self->goto ($map, $x, $y); 3027 $self->goto ($map, $x, $y);
2722 3028
2723 # if exit is damned, update players death & WoR home-position 3029 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y) 3030 $self->contr->savebed ($map, $x, $y)
2729 $self->message ("Something went wrong deep within the deliantra server. " 3035 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 3036 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 3037 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 3038 cf::NDI_UNIQUE | cf::NDI_RED);
2733 3039
2734 warn "ERROR in enter_exit: $@"; 3040 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 3041 $self->leave_link;
2736 } 3042 }
2737 })->prio (1); 3043 })->prio (1);
2738} 3044}
2739 3045
2751sub cf::client::send_drawinfo { 3057sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 3058 my ($self, $text, $flags) = @_;
2753 3059
2754 utf8::encode $text; 3060 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3061 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3062}
3063
3064=item $client->send_big_packet ($pkt)
3065
3066Like C<send_packet>, but tries to compress large packets, and fragments
3067them as required.
3068
3069=cut
3070
3071our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3072
3073sub cf::client::send_big_packet {
3074 my ($self, $pkt) = @_;
3075
3076 # try lzf for large packets
3077 $pkt = "lzf " . Compress::LZF::compress $pkt
3078 if 1024 <= length $pkt and $self->{can_lzf};
3079
3080 # split very large packets
3081 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3082 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3083 $pkt = "frag";
3084 }
3085
3086 $self->send_packet ($pkt);
2756} 3087}
2757 3088
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3089=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3090
2760Send a drawinfo or msg packet to the client, formatting the msg for the 3091Send a drawinfo or msg packet to the client, formatting the msg for the
2764 3095
2765=cut 3096=cut
2766 3097
2767# non-persistent channels (usually the info channel) 3098# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3099our %CHANNEL = (
3100 "c/motd" => {
3101 id => "infobox",
3102 title => "MOTD",
3103 reply => undef,
3104 tooltip => "The message of the day",
3105 },
2769 "c/identify" => { 3106 "c/identify" => {
2770 id => "infobox", 3107 id => "infobox",
2771 title => "Identify", 3108 title => "Identify",
2772 reply => undef, 3109 reply => undef,
2773 tooltip => "Items recently identified", 3110 tooltip => "Items recently identified",
2775 "c/examine" => { 3112 "c/examine" => {
2776 id => "infobox", 3113 id => "infobox",
2777 title => "Examine", 3114 title => "Examine",
2778 reply => undef, 3115 reply => undef,
2779 tooltip => "Signs and other items you examined", 3116 tooltip => "Signs and other items you examined",
3117 },
3118 "c/shopinfo" => {
3119 id => "infobox",
3120 title => "Shop Info",
3121 reply => undef,
3122 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 3123 },
2781 "c/book" => { 3124 "c/book" => {
2782 id => "infobox", 3125 id => "infobox",
2783 title => "Book", 3126 title => "Book",
2784 reply => undef, 3127 reply => undef,
2900 my $pkt = "msg " 3243 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3244 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3245 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3246 );
2904 3247
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3248 $self->send_big_packet ($pkt);
2916} 3249}
2917 3250
2918=item $client->ext_msg ($type, @msg) 3251=item $client->ext_msg ($type, @msg)
2919 3252
2920Sends an ext event to the client. 3253Sends an ext event to the client.
2922=cut 3255=cut
2923 3256
2924sub cf::client::ext_msg($$@) { 3257sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3258 my ($self, $type, @msg) = @_;
2926 3259
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3260 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933}
2934
2935=item $client->ext_reply ($msgid, @msg)
2936
2937Sends an ext reply to the client.
2938
2939=cut
2940
2941sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_;
2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951} 3261}
2952 3262
2953=item $success = $client->query ($flags, "text", \&cb) 3263=item $success = $client->query ($flags, "text", \&cb)
2954 3264
2955Queues a query to the client, calling the given callback with 3265Queues a query to the client, calling the given callback with
3010 my ($ns, $buf) = @_; 3320 my ($ns, $buf) = @_;
3011 3321
3012 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3322 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013 3323
3014 if (ref $msg) { 3324 if (ref $msg) {
3015 my ($type, $reply, @payload) = 3325 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019 3326
3020 my @reply;
3021
3022 if (my $cb = $EXTICMD{$type}) { 3327 if (my $cb = $EXTIACMD{$type}) {
3328 $cb->(
3329 $ns,
3330 sub {
3331 $ns->ext_msg ("reply-$reply", @_)
3332 if $reply;
3333 },
3334 @payload
3335 );
3336 } else {
3337 my @reply;
3338
3339 if (my $cb = $EXTICMD{$type}) {
3023 @reply = $cb->($ns, @payload); 3340 @reply = $cb->($ns, @payload);
3341 }
3342
3343 $ns->ext_msg ("reply-$reply", @reply)
3344 if $reply;
3024 } 3345 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
3029 } else { 3346 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3347 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3348 }
3032 3349
3033 cf::override; 3350 cf::override;
3034 }, 3351 },
3035); 3352);
3055 3372
3056 $coro 3373 $coro
3057} 3374}
3058 3375
3059cf::client->attach ( 3376cf::client->attach (
3060 on_destroy => sub { 3377 on_client_destroy => sub {
3061 my ($ns) = @_; 3378 my ($ns) = @_;
3062 3379
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3380 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3381 },
3065); 3382);
3081our $safe_hole = new Safe::Hole; 3398our $safe_hole = new Safe::Hole;
3082 3399
3083$SIG{FPE} = 'IGNORE'; 3400$SIG{FPE} = 'IGNORE';
3084 3401
3085$safe->permit_only (Opcode::opset qw( 3402$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3403 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3404 grepstart grepwhile mapstart mapwhile
3088 sort time 3405 sort time
3089)); 3406));
3090 3407
3091# here we export the classes and methods available to script code 3408# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3433 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3434 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3435 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3436 ["cf::map" => qw(trigger)],
3120) { 3437) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3438 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3439 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3440 for @funs;
3125} 3441}
3126 3442
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3459 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3460 $qcode =~ s/\n/\\n/g;
3145 3461
3146 %vars = (_dummy => 0) unless %vars; 3462 %vars = (_dummy => 0) unless %vars;
3147 3463
3464 my @res;
3148 local $_; 3465 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3466
3151 my $eval = 3467 my $eval =
3152 "do {\n" 3468 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3469 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3470 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3471 . $code
3156 . "\n}" 3472 . "\n}"
3157 ; 3473 ;
3158 3474
3475 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3476 sub_generation_inc;
3477 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3478 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3479 sub_generation_inc;
3480 } else {
3481 local @cf::_safe_eval_args = values %vars;
3482 @res = wantarray ? eval eval : scalar eval $eval;
3483 }
3162 3484
3163 if ($@) { 3485 if ($@) {
3164 warn "$@"; 3486 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3487 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3488 "with arguments " . (join " ", %vars) . "\n";
3167 } 3489 }
3168 3490
3169 wantarray ? @res : $res[0] 3491 wantarray ? @res : $res[0]
3170} 3492}
3171 3493
3185=cut 3507=cut
3186 3508
3187sub register_script_function { 3509sub register_script_function {
3188 my ($fun, $cb) = @_; 3510 my ($fun, $cb) = @_;
3189 3511
3190 no strict 'refs'; 3512 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3513 *$fun = $safe_hole->wrap ($cb);
3192} 3514}
3193 3515
3194=back 3516=back
3195 3517
3196=cut 3518=cut
3197 3519
3198############################################################################# 3520#############################################################################
3199# the server's init and main functions 3521# the server's init and main functions
3522
3523our %FACEHASH; # hash => idx, #d# HACK for http server
3524
3525# internal api, not fianlised
3526sub set_face {
3527 my ($name, $type, $data) = @_;
3528
3529 my $idx = cf::face::find $name;
3530
3531 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx};
3533 } else {
3534 $idx = cf::face::alloc $name;
3535 }
3536
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3538
3539 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3542 $FACEHASH{$hash} = $idx;#d#
3543
3544 $idx
3545}
3200 3546
3201sub load_facedata($) { 3547sub load_facedata($) {
3202 my ($path) = @_; 3548 my ($path) = @_;
3203 3549
3204 # HACK to clear player env face cache, we need some signal framework 3550 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?) 3551 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3553
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3554 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3555
3210 warn "loading facedata from $path\n"; 3556 trace "loading facedata from $path\n";
3211 3557
3212 my $facedata; 3558 my $facedata = decode_storable load_file $path;
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3559
3218 $facedata->{version} == 2 3560 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3561 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3562
3221 # patch in the exptable
3222 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3225 };
3226 cf::cede_to_tick; 3563 cf::cede_to_tick;
3227 3564
3228 { 3565 {
3229 my $faces = $facedata->{faceinfo}; 3566 my $faces = delete $facedata->{faceinfo};
3230 3567
3231 while (my ($face, $info) = each %$faces) { 3568 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face};
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3570 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3571
3234 cf::face::set_visibility $idx, $info->{visibility}; 3572 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3573 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3577 $FACEHASH{$info->{hash64}} = $idx;#d#
3578
3239 cf::cede_to_tick; 3579 cf::cede_to_tick;
3240 } 3580 }
3241 3581
3242 while (my ($face, $info) = each %$faces) { 3582 while (my ($face, $info) = each %$faces) {
3243 next unless $info->{smooth}; 3583 next unless $info->{smooth};
3247 3587
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3588 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3589 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3591 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3592 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3593 }
3254 3594
3255 cf::cede_to_tick; 3595 cf::cede_to_tick;
3256 } 3596 }
3257 } 3597 }
3258 3598
3259 { 3599 {
3260 my $anims = $facedata->{animinfo}; 3600 my $anims = delete $facedata->{animinfo};
3261 3601
3262 while (my ($anim, $info) = each %$anims) { 3602 while (my ($anim, $info) = each %$anims) {
3263 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3603 cf::anim::set $anim, $info->{frames}, $info->{facings};
3264 cf::cede_to_tick; 3604 cf::cede_to_tick;
3265 } 3605 }
3266 3606
3267 cf::anim::invalidate_all; # d'oh 3607 cf::anim::invalidate_all; # d'oh
3268 } 3608 }
3269 3609
3270 { 3610 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3611 my $res = delete $facedata->{resource};
3274 3612
3275 while (my ($name, $info) = each %$res) { 3613 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3614 if (defined (my $type = $info->{type})) {
3615 # TODO: different hash - must free and use new index, or cache ixface data queue
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3616 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3617
3280 if ($info->{type} & 1) {
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3618 cf::face::set_type $idx, $type;
3619 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3620 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3621 $FACEHASH{$info->{hash}} = $idx;#d#
3295 } else { 3622 } else {
3296 $RESOURCE{$name} = $info; 3623# $RESOURCE{$name} = $info; # unused
3297 } 3624 }
3298 3625
3299 cf::cede_to_tick; 3626 cf::cede_to_tick;
3300 } 3627 }
3301 } 3628 }
3302 3629
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3631
3305 1 3632 1
3306} 3633}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3634
3328register_exticmd fx_want => sub { 3635register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3636 my ($ns, $want) = @_;
3330 3637
3331 while (my ($k, $v) = each %$want) { 3638 while (my ($k, $v) = each %$want) {
3339 my $status = load_resource_file_ $_[0]; 3646 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100; 3647 get_slot 0.1, 100;
3341 cf::arch::commit_load; 3648 cf::arch::commit_load;
3342 3649
3343 $status 3650 $status
3651}
3652
3653sub reload_exp_table {
3654 _reload_exp_table;
3655
3656 set_face "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 );
3660}
3661
3662sub reload_materials {
3663 _reload_materials;
3344} 3664}
3345 3665
3346sub reload_regions { 3666sub reload_regions {
3347 # HACK to clear player env face cache, we need some signal framework 3667 # HACK to clear player env face cache, we need some signal framework
3348 # for this (global event?) 3668 # for this (global event?)
3363} 3683}
3364 3684
3365sub reload_archetypes { 3685sub reload_archetypes {
3366 load_resource_file "$DATADIR/archetypes" 3686 load_resource_file "$DATADIR/archetypes"
3367 or die "unable to load archetypes\n"; 3687 or die "unable to load archetypes\n";
3688
3689 set_face "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 );
3693 set_face "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 );
3368} 3697}
3369 3698
3370sub reload_treasures { 3699sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3700 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3701 or die "unable to load treasurelists\n";
3373} 3702}
3374 3703
3704sub reload_sound {
3705 trace "loading sound config from $DATADIR/sound\n";
3706
3707 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3708
3709 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3710 my $sound = $soundconf->{compat}[$_]
3711 or next;
3712
3713 my $face = cf::face::find "sound/$sound->[1]";
3714 cf::sound::set $sound->[0] => $face;
3715 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3716 }
3717
3718 while (my ($k, $v) = each %{$soundconf->{event}}) {
3719 my $face = cf::face::find "sound/$v";
3720 cf::sound::set $k => $face;
3721 }
3722}
3723
3375sub reload_resources { 3724sub reload_resources {
3376 warn "reloading resource files...\n"; 3725 trace "reloading resource files...\n";
3377 3726
3727 reload_materials;
3378 reload_facedata; 3728 reload_facedata;
3729 reload_exp_table;
3730 reload_sound;
3379 reload_archetypes; 3731 reload_archetypes;
3380 reload_regions; 3732 reload_regions;
3381 reload_treasures; 3733 reload_treasures;
3382 3734
3383 warn "finished reloading resource files\n"; 3735 trace "finished reloading resource files\n";
3384} 3736}
3385 3737
3386sub reload_config { 3738sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3739 trace "reloading config file...\n";
3388 or return;
3389 3740
3390 local $/; 3741 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3742 utf8::decode $config;
3743 *CFG = decode_yaml $config;
3392 3744
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3745 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3746
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3747 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3748 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3749
3398 if (exists $CFG{mlockall}) { 3750 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3774 seek $fh, 0, 0;
3423 print $fh $$; 3775 print $fh $$;
3424} 3776}
3425 3777
3426sub main_loop { 3778sub main_loop {
3427 warn "EV::loop starting\n"; 3779 trace "EV::loop starting\n";
3428 if (1) { 3780 if (1) {
3429 EV::loop; 3781 EV::loop;
3430 } 3782 }
3431 warn "EV::loop returned\n"; 3783 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3784 goto &main_loop unless $REALLY_UNLOOP;
3433} 3785}
3434 3786
3435sub main { 3787sub main {
3436 cf::init_globals; # initialise logging 3788 cf::init_globals; # initialise logging
3437 3789
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3790 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3791 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3792 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3793 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442 3794
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3795 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3796
3450 # we must not ever block the main coroutine 3797 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3798 $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3799 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3800 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3801 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3802 EV::loop EV::LOOP_ONESHOT;
3456 })->prio (Coro::PRIO_MAX); 3803 })->prio (Coro::PRIO_MAX);
3457 }; 3804 };
3458 3805
3459 evthread_start IO::AIO::poll_fileno; 3806 evthread_start IO::AIO::poll_fileno;
3460 3807
3461 cf::sync_job { 3808 cf::sync_job {
3809 cf::incloader::init ();
3810
3811 db_init;
3812
3813 cf::init_anim;
3814 cf::init_attackmess;
3815 cf::init_dynamic;
3816
3817 cf::load_settings;
3818
3462 reload_resources; 3819 reload_resources;
3463 reload_config; 3820 reload_config;
3464 db_init;
3465 3821
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3822 cf::init_uuid;
3469 cf::init_signals; 3823 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3824 cf::init_skills;
3472 3825
3473 cf::init_beforeplay; 3826 cf::init_beforeplay;
3474 3827
3475 atomic; 3828 atomic;
3480 3833
3481 # no (long-running) fork's whatsoever before this point(!) 3834 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3835 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3836 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3837
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3838 cf::_post_init 0;
3486 }; 3839 };
3487 3840
3841 cf::object::thawer::errors_are_fatal 0;
3842 info "parse errors in files are no longer fatal from this point on.\n";
3843
3844 AE::postpone {
3845 undef &main; # free gobs of memory :)
3846 };
3847
3488 main_loop; 3848 goto &main_loop;
3489} 3849}
3490 3850
3491############################################################################# 3851#############################################################################
3492# initialisation and cleanup 3852# initialisation and cleanup
3493 3853
3494# install some emergency cleanup handlers 3854# install some emergency cleanup handlers
3495BEGIN { 3855BEGIN {
3496 our %SIGWATCHER = (); 3856 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3857 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3858 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3859 cf::cleanup "SIG$signal";
3500 }; 3860 };
3501 } 3861 }
3502} 3862}
3503 3863
3504sub write_runtime_sync { 3864sub write_runtime_sync {
3865 my $t0 = AE::time;
3866
3505 # first touch the runtime file to show we are still running: 3867 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3868 # the fsync below can take a very very long time.
3507 3869
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3870 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3871
3510 my $guard = cf::lock_acquire "write_runtime"; 3872 my $guard = cf::lock_acquire "write_runtime";
3511 3873
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3874 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3875 or return;
3514 3876
3515 my $value = $cf::RUNTIME + 90 + 10; 3877 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3878 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3879 # 60 allows for the watchdog to kill the server.
3530 or return; 3892 or return;
3531 3893
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3894 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3895 and return;
3534 3896
3535 warn "runtime file written.\n"; 3897 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3898
3537 1 3899 1
3538} 3900}
3539 3901
3540our $uuid_lock; 3902our $uuid_lock;
3552 or return; 3914 or return;
3553 3915
3554 my $value = uuid_seq uuid_cur; 3916 my $value = uuid_seq uuid_cur;
3555 3917
3556 unless ($value) { 3918 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3919 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3920 return;
3559 } 3921 }
3560 3922
3561 my $value = uuid_str $value + $uuid_skip; 3923 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3924 $uuid_skip = 0;
3572 or return; 3934 or return;
3573 3935
3574 aio_rename "$uuid~", $uuid 3936 aio_rename "$uuid~", $uuid
3575 and return; 3937 and return;
3576 3938
3577 warn "uuid file written ($value).\n"; 3939 trace "uuid file written ($value).\n";
3578 3940
3579 1 3941 1
3580 3942
3581} 3943}
3582 3944
3588} 3950}
3589 3951
3590sub emergency_save() { 3952sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3953 my $freeze_guard = cf::freeze_mainloop;
3592 3954
3593 warn "emergency_perl_save: enter\n"; 3955 info "emergency_perl_save: enter\n";
3956
3957 # this is a trade-off: we want to be very quick here, so
3958 # save all maps without fsync, and later call a global sync
3959 # (which in turn might be very very slow)
3960 local $USE_FSYNC = 0;
3594 3961
3595 cf::sync_job { 3962 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3963 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3964
3601 # use a peculiar iteration method to avoid tripping on perl 3965 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3966 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3967 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3968 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3969 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3970 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3971 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3972 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3973 $pl->save;
3610 } 3974 }
3611 warn "emergency_perl_save: end player save\n"; 3975 info "emergency_perl_save: end player save\n";
3612 3976
3977 cf::write_runtime_sync; # external watchdog should not bark
3978
3613 warn "emergency_perl_save: begin map save\n"; 3979 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3980 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3981 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3982 $map->valid or next;
3617 $map->save; 3983 $map->save;
3618 } 3984 }
3619 warn "emergency_perl_save: end map save\n"; 3985 info "emergency_perl_save: end map save\n";
3620 3986
3987 cf::write_runtime_sync; # external watchdog should not bark
3988
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3989 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3990 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3991 info "emergency_perl_save: end database checkpoint\n";
3624 3992
3625 warn "emergency_perl_save: begin write uuid\n"; 3993 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3994 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3995 info "emergency_perl_save: end write uuid\n";
3996
3997 cf::write_runtime_sync; # external watchdog should not bark
3998
3999 trace "emergency_perl_save: syncing database to disk";
4000 BDB::db_env_txn_checkpoint $DB_ENV;
4001
4002 info "emergency_perl_save: starting sync\n";
4003 IO::AIO::aio_sync sub {
4004 info "emergency_perl_save: finished sync\n";
4005 };
4006
4007 cf::write_runtime_sync; # external watchdog should not bark
4008
4009 trace "emergency_perl_save: flushing outstanding aio requests";
4010 while (IO::AIO::nreqs || BDB::nreqs) {
4011 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4012 }
4013
4014 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 4015 };
3629 4016
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 4017 info "emergency_perl_save: leave\n";
3636} 4018}
3637 4019
3638sub post_cleanup { 4020sub post_cleanup {
3639 my ($make_core) = @_; 4021 my ($make_core) = @_;
3640 4022
4023 IO::AIO::flush;
4024
3641 warn Carp::longmess "post_cleanup backtrace" 4025 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 4026 if $make_core;
3643 4027
3644 my $fh = pidfile; 4028 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 4029 unlink $PIDFILE if <$fh> == $$;
3646} 4030}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4050 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 4051 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 4052 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4053# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 4054 }
3671 warn "cleared package $pkg\n";#d#
3672} 4055}
3673 4056
3674sub do_reload_perl() { 4057sub do_reload_perl() {
3675 # can/must only be called in main 4058 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 4059 unless (in_main) {
3677 warn "can only reload from main coroutine"; 4060 error "can only reload from main coroutine";
3678 return; 4061 return;
3679 } 4062 }
3680 4063
3681 return if $RELOAD++; 4064 return if $RELOAD++;
3682 4065
3683 my $t1 = EV::time; 4066 my $t1 = AE::time;
3684 4067
3685 while ($RELOAD) { 4068 while ($RELOAD) {
3686 warn "reloading..."; 4069 cf::get_slot 0.1, -1, "reload_perl";
4070 info "perl_reload: reloading...";
3687 4071
3688 warn "entering sync_job"; 4072 trace "perl_reload: entering sync_job";
3689 4073
3690 cf::sync_job { 4074 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 4075 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 4076
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 4077 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 4078 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 4079 %EXT_CORO = ();
3708 4080
3709 warn "removing commands"; 4081 trace "perl_reload: removing commands";
3710 %COMMAND = (); 4082 %COMMAND = ();
3711 4083
3712 warn "removing ext/exti commands"; 4084 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 4085 %EXTCMD = ();
3714 %EXTICMD = (); 4086 %EXTICMD = ();
3715 4087
3716 warn "unloading/nuking all extensions"; 4088 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 4089 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 4090 trace "... unloading $pkg";
3719 4091
3720 if (my $cb = $pkg->can ("unload")) { 4092 if (my $cb = $pkg->can ("unload")) {
3721 eval { 4093 eval {
3722 $cb->($pkg); 4094 $cb->($pkg);
3723 1 4095 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 4096 } or error "$pkg unloaded, but with errors: $@";
3725 } 4097 }
3726 4098
3727 warn "... clearing $pkg"; 4099 trace "... clearing $pkg";
3728 clear_package $pkg; 4100 clear_package $pkg;
3729 } 4101 }
3730 4102
3731 warn "unloading all perl modules loaded from $LIBDIR"; 4103 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 4104 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4105 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 4106
3735 warn "... unloading $k"; 4107 trace "... unloading $k";
3736 delete $INC{$k}; 4108 delete $INC{$k};
3737 4109
3738 $k =~ s/\.pm$//; 4110 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4111 $k =~ s/\//::/g;
3740 4112
3743 } 4115 }
3744 4116
3745 clear_package $k; 4117 clear_package $k;
3746 } 4118 }
3747 4119
3748 warn "getting rid of safe::, as good as possible"; 4120 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4121 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4122 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 4123
3752 warn "unloading cf.pm \"a bit\""; 4124 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4125 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4126 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4127
3756 # don't, removes xs symbols, too, 4128 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4129 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4130 #clear_package __PACKAGE__;
3759 4131
3760 warn "unload completed, starting to reload now"; 4132 info "perl_reload: unload completed, starting to reload now";
3761 4133
3762 warn "reloading cf.pm"; 4134 trace "perl_reload: reloading cf.pm";
3763 require cf; 4135 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4136 cf::_connect_to_perl_1;
3765 4137
3766 warn "loading config and database again"; 4138 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4139 cf::reload_config;
3768 4140
3769 warn "loading extensions"; 4141 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4142 cf::load_extensions;
3771 4143
3772 if ($REATTACH_ON_RELOAD) { 4144 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4145 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4146 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4147 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4148 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4149 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4150 reattach $_ for values %PLAYER;
3779 } 4151 }
3780 4152
3781 warn "running post_init jobs"; 4153 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4154
3784 warn "leaving sync_job"; 4155 trace "perl_reload: leaving sync_job";
3785 4156
3786 1 4157 1
3787 } or do { 4158 } or do {
3788 warn $@; 4159 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4160 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4161 };
3791 4162
3792 warn "reloaded";
3793 --$RELOAD; 4163 --$RELOAD;
3794 } 4164 }
3795 4165
3796 $t1 = EV::time - $t1; 4166 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4167 info "perl_reload: completed in ${t1}s\n";
3798}; 4168};
3799 4169
3800our $RELOAD_WATCHER; # used only during reload 4170our $RELOAD_WATCHER; # used only during reload
3801 4171
3802sub reload_perl() { 4172sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4174 # coro crashes during coro_state_free->destroy here.
3805 4175
3806 $RELOAD_WATCHER ||= cf::async { 4176 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4177 Coro::AIO::aio_wait cache_extensions;
3808 4178
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4179 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4180 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4181 undef $RELOAD_WATCHER;
3812 }; 4182 };
3813 }; 4183 };
3814} 4184}
3823 reload_perl; 4193 reload_perl;
3824 }; 4194 };
3825 } 4195 }
3826}; 4196};
3827 4197
3828unshift @INC, $LIBDIR; 4198#############################################################################
3829 4199
3830my $bug_warning = 0; 4200my $bug_warning = 0;
3831 4201
3832our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN;
3834
3835sub wait_for_tick { 4202sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4203 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837 4204
3838 my $signal = new Coro::Signal; 4205 $WAIT_FOR_TICK->wait;
3839 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait;
3841} 4206}
3842 4207
3843sub wait_for_tick_begin { 4208sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4209 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845 4210
3846 my $signal = new Coro::Signal; 4211 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4212 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4213 $signal->wait;
3849} 4214}
3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4218 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3854 unless ++$bug_warning > 10; 4219 unless ++$bug_warning > 10;
3855 return; 4220 return;
3856 } 4221 }
3857 4222
3858 cf::server_tick; # one server iteration 4223 cf::one_tick; # one server iteration
4224
4225 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 4226
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4227 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4228 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4229 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4230 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4231 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4232 or error "ERROR: unable to write runtime file: $!";
3866 }; 4233 };
3867 } 4234 }
3868 4235
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4237 $sig->send;
3871 } 4238 }
3872 while (my $sig = shift @WAIT_FOR_TICK) { 4239 $WAIT_FOR_TICK->broadcast;
3873 $sig->send;
3874 }
3875 4240
3876 $LOAD = ($NOW - $TICK_START) / $TICK; 4241 $LOAD = ($NOW - $TICK_START) / $TICK;
3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4242 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878 4243
3879 if (0) { 4244 if (0) {
3880 if ($NEXT_TICK) { 4245 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4246 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4247 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4248 debug "jitter $JITTER\n";#d#
3884 } 4249 }
3885 } 4250 }
3886} 4251}
3887 4252
3888{ 4253{
3889 # configure BDB 4254 # configure BDB
4255 info "initialising database";
3890 4256
3891 BDB::min_parallel 8; 4257 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4258 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4259 #$AnyEvent::BDB::WATCHER->priority (1);
3894 4260
3895 unless ($DB_ENV) { 4261 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4262 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4263 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4264 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3923 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4289 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3924 }; 4290 };
3925 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4291 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3926 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4292 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3927 }; 4293 };
4294
4295 info "database initialised";
3928} 4296}
3929 4297
3930{ 4298{
3931 # configure IO::AIO 4299 # configure IO::AIO
3932 4300
4301 info "initialising aio";
3933 IO::AIO::min_parallel 8; 4302 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4303 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4304 undef $AnyEvent::AIO::WATCHER;
4305 info "aio initialised";
3936} 4306}
3937 4307
3938my $_log_backtrace; 4308our $_log_backtrace;
4309our $_log_backtrace_last;
3939 4310
3940sub _log_backtrace { 4311sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4312 my ($msg, @addr) = @_;
3942 4313
3943 $msg =~ s/\n//; 4314 $msg =~ s/\n$//;
3944 4315
4316 if ($_log_backtrace_last eq $msg) {
4317 LOG llevInfo, "[ABT] $msg\n";
4318 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4319 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4320 } elsif ($_log_backtrace < 2) {
4321 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4322 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4323 my $perl_bt = Carp::longmess $msg;
3949 async { 4324 async {
3950 $Coro::current->{desc} = "abt $msg"; 4325 $Coro::current->{desc} = "abt $msg";
3951 4326
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4346 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4347 --$_log_backtrace;
3973 }; 4348 };
3974 } else { 4349 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4350 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4351 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4352 }
3978} 4353}
3979 4354
3980# load additional modules 4355# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4356require "cf/$_.pm" for @EXTRA_MODULES;
4357cf::_connect_to_perl_2;
3982 4358
3983END { cf::emergency_save } 4359END { cf::emergency_save }
3984 4360
39851 43611
3986 4362

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines