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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.567 by root, Mon May 2 16:16:00 2011 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 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# <http://www.gnu.org/licenses/>.
18# 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 "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 ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
91our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 112
100our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
101 120
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 123our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
106 125
107our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 129our $DB_ENV;
111 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
112our %CFG; 133our %CFG;
113 134
114our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 136our $RUNTIME;
116our $NOW; 137our $NOW;
124 145
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 148our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
129 155
130binmode STDOUT; 156binmode STDOUT;
131binmode STDERR; 157binmode STDERR;
132 158
133# read virtual server time, if available 159# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
138} 164}
139 165
166eval "sub TICK() { $TICK } 1" or die;
167
140mkdir $_ 168mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 170
143our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
144 172
145sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 189
147############################################################################# 190#############################################################################
148 191
149=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
150 193
192from wherever your confdir points to. 235from wherever your confdir points to.
193 236
194=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
195 238
196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
197returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
200=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
201 249
202This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 252that call.
205 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
206=back 260=back
207 261
208=cut 262=cut
209 263
210BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
211 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
212 my $msg = join "", @_; 271 my $msg = join "", @_;
213 272
214 $msg .= "\n" 273 $msg .= "\n"
215 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
216 275
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 277
219 LOG llevError, $msg; 278 LOG llevWarn, $msg;
220 }; 279};
221}
222 280
223$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
225 283
226 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 288 return;#d#
229 }#d# 289 }#d#
230 290
231 # kill coroutine otherwise 291 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 292 Coro::terminate
234}; 293};
235
236$SIG{__DIE__} = sub { }; #d#?
237 294
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 312)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 314}
258 315
259$EV::DIED = sub { 316$EV::DIED = sub {
260 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
261}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
262 324
263############################################################################# 325#############################################################################
264 326
265=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
266 328
287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
288 $d 350 $d
289 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
290} 352}
291 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
292=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
293 369
294Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
295 371
296=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 379
304sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
306 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
307=item cf::lock_wait $string 445=item cf::lock_wait $string
308 446
309Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
310 448
311=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
312 450
313Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
316returned. 454returned.
317 455
318Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 457deadlocked coro.
325 463
326Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
327 465
328=cut 466=cut
329 467
330our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 469
333sub lock_wait($) { 470sub lock_wait($) {
334 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 472}
347 473
348sub lock_acquire($) { 474sub lock_acquire($) {
349 my ($key) = @_; 475 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 476}
363 477
364sub lock_active($) { 478sub lock_active($) {
365 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 480}
369 481
370sub freeze_mainloop { 482sub freeze_mainloop {
371 tick_inhibit_inc; 483 tick_inhibit_inc;
372 484
373 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
374} 486}
375 487
376=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
377 489
378Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 491get spread over time.
380 492
381=cut 493=cut
382 494
383sub periodic($$) { 495sub periodic($$) {
384 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
388 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
389} 501}
390 502
391=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
392 504
393Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
394This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
395of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
396 512
397The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
398used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
399 515
400Useful for short background jobs. 516Useful for short background jobs.
401 517
402=cut 518=cut
403 519
404our @SLOT_QUEUE; 520our @SLOT_QUEUE;
405our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
406 523
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
410 527
411 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
412 530
413 while () { 531 while () {
414 next_job: 532 next_job:
533
415 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 535
417 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 540 $job->[2]->send;
421 Coro::cede; 541 Coro::cede;
422 goto next_job; 542 goto next_job;
423 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 545 }
425 } 546 }
426 547
427 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 551 $signal->wait;
431 } else { 552 } else {
553 $busy = 0;
432 Coro::schedule; 554 Coro::schedule;
433 } 555 }
434 } 556 }
435}; 557};
436 558
437sub get_slot($;$$) { 559sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
439 561
440 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
441 563
442 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
443 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
444 567
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
473=cut 596=cut
474 597
475sub sync_job(&) { 598sub sync_job(&) {
476 my ($job) = @_; 599 my ($job) = @_;
477 600
478 if ($Coro::current == $Coro::main) { 601 if (in_main) {
479 my $time = EV::time; 602 my $time = AE::time;
480 603
481 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
483 606
484 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
485 608
486 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
487 610
488 my $busy = 1; 611 my $busy = 1;
489 my @res; 612 my @res;
490 613
491 (async { 614 (async {
492 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 616 @res = eval { $job->() };
494 warn $@ if $@; 617 error $@ if $@;
495 undef $busy; 618 undef $busy;
496 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
497 620
498 while ($busy) { 621 while ($busy) {
499 if (Coro::nready) { 622 if (Coro::nready) {
501 } else { 624 } else {
502 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
503 } 626 }
504 } 627 }
505 628
506 my $time = EV::time - $time; 629 my $time = AE::time - $time;
507 630
508 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
509 632
510 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
511 } else { 634 } else {
533 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
534 657
535 $coro 658 $coro
536} 659}
537 660
538=item fork_call { }, $args 661=item fork_call { }, @args
539 662
540Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 666never block itself or use any form of event handling.
544 667
545=cut 668=cut
546 669
670sub post_fork {
671 reset_signals;
672}
673
547sub fork_call(&@) { 674sub fork_call(&@) {
548 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
549 676
550 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
551 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
553 680
554 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
555 reset_signals; 682 cf::post_fork;
556 &$cb 683 &$cb
557 }, @args; 684 } @args;
558 685
559 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
560} 698}
561 699
562=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
563 701
564=cut 702=cut
601within each server. 739within each server.
602 740
603=cut 741=cut
604 742
605sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
606 my ($name) = @_; 747 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
608 749
609 eval { 750 eval {
610 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
620} 761}
621 762
622our $DB; 763our $DB;
623 764
624sub db_init { 765sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
627 };
628} 767}
629 768
630sub db_get($$) { 769sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
632 771
633 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
634 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
635 776
636 $! ? () 777 $! ? ()
637 : $data 778 : $data
638 }
639} 779}
640 780
641sub db_put($$$) { 781sub db_put($$$) {
642 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
671 811
672 my @data; 812 my @data;
673 my $md5; 813 my $md5;
674 814
675 for (0 .. $#$src) { 815 for (0 .. $#$src) {
676 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
677 or Carp::croak "$src->[$_]: $!";
678 } 817 }
679 818
680 # if processing is expensive, check 819 # if processing is expensive, check
681 # checksum first 820 # checksum first
682 if (1) { 821 if (1) {
699 838
700 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 840 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
703 842
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 844
706 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
709 848
719 858
720=cut 859=cut
721 860
722sub datalog($@) { 861sub datalog($@) {
723 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 864}
726 865
727=back 866=back
728 867
729=cut 868=cut
924 1063
925 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1066
928 } elsif (ref $type) { 1067 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
930 1069
931 } else { 1070 } else {
932 shift @arg; 1071 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
934 } 1073 }
935 } 1074 }
936} 1075}
937 1076
938sub _object_attach { 1077sub _object_attach {
948 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
949 } 1088 }
950 1089
951 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
952 } else { 1091 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1093 }
955 1094
956 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
957} 1096}
958 1097
1017 1156
1018 for (@$callbacks) { 1157 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1020 1159
1021 if ($@) { 1160 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1162 override;
1025 } 1163 }
1026 1164
1027 return 1 if $override; 1165 return 1 if $override;
1028 } 1166 }
1107 for (@$attach) { 1245 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1110 } 1248 }
1111 } else { 1249 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1251 }
1114 } 1252 }
1115} 1253}
1116 1254
1117cf::attachable->attach ( 1255cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1145 1283
1146 sync_job { 1284 sync_job {
1147 if (length $$rdata) { 1285 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1151 1290
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1296 aio_fsync $fh;
1297 }
1156 aio_close $fh; 1298 aio_close $fh;
1157 1299
1158 if (@$objs) { 1300 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1307 aio_fsync $fh;
1308 }
1164 aio_close $fh; 1309 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1311 }
1167 } else { 1312 } else {
1168 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1169 } 1314 }
1170 1315
1171 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1320 } else {
1173 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1174 } 1322 }
1175 } else { 1323 } else {
1176 aio_unlink $filename; 1324 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1178 } 1326 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1351 $av = $st->{objs};
1204 } 1352 }
1205 1353
1206 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1209 1358
1210 ($data, $av) 1359 ($data, $av)
1211} 1360}
1212 1361
1213=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1270 1419
1271 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1272} 1421}
1273 1422
1423use File::Glob ();
1424
1274cf::player->attach ( 1425cf::player->attach (
1275 on_command => sub { 1426 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1277 1428
1278 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1279 or return; 1430 or return;
1280 1431
1303 1454
1304 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1456 if $reply;
1306 1457
1307 } else { 1458 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1460 }
1310 1461
1311 cf::override; 1462 cf::override;
1312 }, 1463 },
1313); 1464);
1314 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1315sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1316 cf::sync_job { 1482 cf::sync_job {
1317 my %todo; 1483 my %todo;
1318 1484
1319 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1486 next unless -r $path;
1338 1504
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1507
1342 $ext{source} = 1508 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1345 . $source 1511 . $source
1346 . "\n};\n1"; 1512 . "\n};\n1";
1347 1513
1348 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1349 } 1515 }
1350 1516
1517 my $pass = 0;
1351 my %done; 1518 my %done;
1352 while (%todo) { 1519 while (%todo) {
1353 my $progress; 1520 my $progress;
1354 1521
1522 ++$pass;
1523
1524 ext:
1355 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1527 next ext
1358 unless exists $done{$_}; 1528 unless exists $done{$_};
1359 } 1529 }
1360 1530
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1532
1363 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1537
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1539 if exists $v->{meta}{mandatory};
1371 1540
1372 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1373 } 1550 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1551 }
1379 1552
1380 skip: 1553 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1383 } 1563 }
1384 }; 1564 };
1385} 1565}
1386 1566
1387############################################################################# 1567#############################################################################
1441 1621
1442sub exists($) { 1622sub exists($) {
1443 my ($login) = @_; 1623 my ($login) = @_;
1444 1624
1445 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1447} 1627}
1448 1628
1449sub find($) { 1629sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1631 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1472 } 1652 }
1473 } 1653 }
1474} 1654}
1475 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1476sub save($) { 1669sub save($) {
1477 my ($pl) = @_; 1670 my ($pl) = @_;
1478 1671
1479 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1480 1673
1485 1678
1486 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1488 1681
1489 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1686
1491 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1688 cf::cede_to_tick;
1493} 1689}
1494 1690
1528 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1529 1725
1530 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1728
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1730 $pl->deactivate;
1731
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1538 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1539 1737
1540 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1596 \@logins 1794 \@logins
1597} 1795}
1598 1796
1599=item $player->maps 1797=item $player->maps
1600 1798
1799=item cf::player::maps $login
1800
1601Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1602player. May block. 1802player. May block.
1603 1803
1604=cut 1804=cut
1605 1805
1667=cut 1867=cut
1668 1868
1669sub find_by_path($) { 1869sub find_by_path($) {
1670 my ($path) = @_; 1870 my ($path) = @_;
1671 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1672 my ($match, $specificity); 1874 my ($match, $specificity);
1673 1875
1674 for my $region (list) { 1876 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1676 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1704sub generate_random_map { 1906sub generate_random_map {
1705 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1706 1908
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1910
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 1912}
1724 1913
1725=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1726 1915
1727Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1732 1921
1733sub register { 1922sub register {
1734 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1924 my $pkg = caller;
1736 1925
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1927
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1929}
1742 1930
1743# also paths starting with '/' 1931# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1933
1746sub thawer_merge { 1934sub thawer_merge {
1747 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1748 1936
1749 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1754} 1942}
1755 1943
1756sub normalise { 1944sub normalise {
1757 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1758 1946
1759 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1760 1948
1761 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1762 1950
1763 # map plan: 1951 # map plan:
1764 # 1952 #
1779 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 1968 $path = "$base/$path";
1781 } 1969 }
1782 1970
1783 for ($path) { 1971 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1787 } 1974 }
1788 1975
1789 $path 1976 $path
1803 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1804 return $self; 1991 return $self;
1805 } 1992 }
1806 } 1993 }
1807 1994
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 1996 ()
1810} 1997}
1811 1998
1999# may re-bless or do other evil things
1812sub init { 2000sub init {
1813 my ($self) = @_; 2001 my ($self) = @_;
1814 2002
1815 $self 2003 $self
1816} 2004}
1847 2035
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1850} 2038}
1851 2039
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 2040sub decay_objects {
1862 my ($self) = @_; 2041 my ($self) = @_;
1863 2042
1864 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1865 2044
1890 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1891 2070
1892 1 2071 1
1893} 2072}
1894 2073
2074# used to laod the header of an original map
1895sub load_header_orig { 2075sub load_header_orig {
1896 my ($self) = @_; 2076 my ($self) = @_;
1897 2077
1898 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1899} 2079}
1900 2080
2081# used to laod the header of an instantiated map
1901sub load_header_temp { 2082sub load_header_temp {
1902 my ($self) = @_; 2083 my ($self) = @_;
1903 2084
1904 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1905} 2086}
1906 2087
2088# called after loading the header from an instantiated map
1907sub prepare_temp { 2089sub prepare_temp {
1908 my ($self) = @_; 2090 my ($self) = @_;
1909 2091
1910 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1911 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1912 # safety 2094 # safety
1913 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1914 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1915} 2097}
1916 2098
2099# called after loading the header from an original map
1917sub prepare_orig { 2100sub prepare_orig {
1918 my ($self) = @_; 2101 my ($self) = @_;
1919 2102
1920 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1921 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1945 2128
1946sub find; 2129sub find;
1947sub find { 2130sub find {
1948 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1949 2132
2133 cf::cede_to_tick;
2134
1950 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1951 2136
1952 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2139
1955 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1960 or return; 2142 or return;
1961 2143
1962 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1963 2145
1975 2157
1976 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1977 } 2159 }
1978} 2160}
1979 2161
1980sub pre_load { } 2162sub pre_load { }
1981sub post_load { } 2163#sub post_load { } # XS
1982 2164
1983sub load { 2165sub load {
1984 my ($self) = @_; 2166 my ($self) = @_;
1985 2167
1986 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1998 $self->alloc; 2180 $self->alloc;
1999 2181
2000 $self->pre_load; 2182 $self->pre_load;
2001 cf::cede_to_tick; 2183 cf::cede_to_tick;
2002 2184
2185 if (exists $self->{load_path}) {
2003 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block; 2187 $f->skip_block;
2005 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2006 or return; 2189 or return;
2007 2190
2008 $self->post_load_original 2191 $self->post_load_original
2009 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2010 2193
2011 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2012 utf8::encode $uniq; 2195 utf8::encode $uniq;
2013 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2015 $self->clear_unique_items; 2198 $self->clear_unique_items;
2016 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2018 } 2202 }
2019 } 2203 }
2020 }
2021 2204
2022 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2023 2210
2024 cf::cede_to_tick; 2211 cf::cede_to_tick;
2025 # now do the right thing for maps 2212 # now do the right thing for maps
2026 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2027 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2031 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2219 $self->decay_objects;
2033 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2034 $self->update_buttons; 2221 $self->update_buttons;
2035 cf::cede_to_tick; 2222 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2223 $self->activate;
2039 } 2224 }
2040 2225
2041 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2043 2228
2044 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2230 }
2046 2231
2047 $self->post_load; 2232 $self->post_load;
2048}
2049 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
2050sub customise_for { 2240sub customise_for {
2051 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
2052 2242
2053 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2244 if $self->per_player;
2070 or next; 2260 or next;
2071 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2072 or next; 2262 or next;
2073 $neigh->load; 2263 $neigh->load;
2074 2264
2265 # now find the diagonal neighbours
2075 push @neigh, 2266 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2269 }
2079 2270
2086} 2277}
2087 2278
2088sub find_sync { 2279sub find_sync {
2089 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2090 2281
2091 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2092} 2286}
2093 2287
2094sub do_load_sync { 2288sub do_load_sync {
2095 my ($map) = @_; 2289 my ($map) = @_;
2096 2290
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2099 2293
2100 cf::sync_job { $map->load }; 2294 $map->load;
2101} 2295}
2102 2296
2103our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2105 2299
2106sub find_async { 2300sub find_async {
2107 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2108 2302
2109 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2110 2304
2111 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2113 } 2307 }
2114 2308
2131 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2132 2326
2133 () 2327 ()
2134} 2328}
2135 2329
2330# common code, used by both ->save and ->swapout
2136sub save { 2331sub _save {
2137 my ($self) = @_; 2332 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2333
2141 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2142 2335
2143 return unless $self->dirty; 2336 return unless $self->dirty;
2144 2337
2164 } else { 2357 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2359 }
2167} 2360}
2168 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2169sub swap_out { 2370sub swap_out {
2170 my ($self) = @_; 2371 my ($self) = @_;
2171 2372
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2374
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2375 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2376 return if $self->{deny_save};
2377 return if $self->players;
2180 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2182 2429
2183 $self->deactivate; 2430 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2432 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2433
2231 $self->unlink_save; 2434 $self->unlink_save;
2232 $self->destroy; 2435 $self->destroy;
2233} 2436}
2234 2437
2242 2445
2243 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2244 2447
2245 $self->unlink_save; 2448 $self->unlink_save;
2246 2449
2247 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2455
2309 : normalise $_ 2512 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2514 ]
2312} 2515}
2313 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2314=back 2549=back
2315 2550
2316=head3 cf::object 2551=head3 cf::object
2317 2552
2318=cut 2553=cut
2383 2618
2384our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2385 id => "say", 2620 id => "say",
2386 title => "Map", 2621 title => "Map",
2387 reply => "say ", 2622 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2624};
2390 2625
2391our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2392 id => "chat", 2627 id => "chat",
2393 title => "Chat", 2628 title => "Chat",
2450 2685
2451Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2452 2687
2453The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2456map. 2691map.
2457 2692
2458Will never block. 2693Will never block.
2459 2694
2460=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2482 my ($self) = @_; 2717 my ($self) = @_;
2483 2718
2484 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2485 2720
2721 ++$self->{_link_recursion};
2722
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2724
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2490 2727
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2729}
2493 2730
2494sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2496 2733
2513 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2515 2752
2516 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2519 2756
2520 $map->load; 2757 $map->load;
2521 $map->load_neighbours; 2758 $map->load_neighbours;
2522 2759
2523 return unless $self->contr->active; 2760 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2761
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2529} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2530 2769
2770}
2771
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2773
2533Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2543 2784
2544our $GOTOGEN; 2785our $GOTOGEN;
2545 2786
2546sub cf::object::player::goto { 2787sub cf::object::player::goto {
2547 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2548 2795
2549 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2798
2552 $self->enter_link; 2799 $self->enter_link;
2572 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2573 } 2820 }
2574 } 2821 }
2575 2822
2576 my $map = eval { 2823 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2578 2825
2579 if ($map) { 2826 if ($map) {
2580 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2829 } else {
2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584 } 2831 }
2585 2832
2586 $map 2833 $map
2594 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2597 } 2844 }
2598 2845
2599 $done->() if $done; 2846 $done->($self) if $done;
2600 })->prio (1); 2847 })->prio (1);
2601} 2848}
2602 2849
2603=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2604 2851
2672 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2673 2920
2674 unless (eval { 2921 unless (eval {
2675 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2676 2923
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2686 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2688 2948
2689 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2690 2950
2691 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
2697 $self->message ("Something went wrong deep within the deliantra server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2961
2702 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 2963 $self->leave_link;
2704 } 2964 }
2705 })->prio (1); 2965 })->prio (1);
2706} 2966}
2707 2967
2719sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2721 2981
2722 utf8::encode $text; 2982 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2984}
2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
2724} 3009}
2725 3010
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 3012
2728Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2732 3017
2733=cut 3018=cut
2734 3019
2735# non-persistent channels (usually the info channel) 3020# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
2737 "c/identify" => { 3028 "c/identify" => {
2738 id => "infobox", 3029 id => "infobox",
2739 title => "Identify", 3030 title => "Identify",
2740 reply => undef, 3031 reply => undef,
2741 tooltip => "Items recently identified", 3032 tooltip => "Items recently identified",
2743 "c/examine" => { 3034 "c/examine" => {
2744 id => "infobox", 3035 id => "infobox",
2745 title => "Examine", 3036 title => "Examine",
2746 reply => undef, 3037 reply => undef,
2747 tooltip => "Signs and other items you examined", 3038 tooltip => "Signs and other items you examined",
3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 3045 },
2749 "c/book" => { 3046 "c/book" => {
2750 id => "infobox", 3047 id => "infobox",
2751 title => "Book", 3048 title => "Book",
2752 reply => undef, 3049 reply => undef,
2768 id => "infobox", 3065 id => "infobox",
2769 title => "Body Parts", 3066 title => "Body Parts",
2770 reply => undef, 3067 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3068 tooltip => "Shows which body parts you posess and are available",
2772 }, 3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
3076 "c/skills" => {
3077 id => "infobox",
3078 title => "Skills",
3079 reply => undef,
3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
3105 },
2773 "c/uptime" => { 3106 "c/uptime" => {
2774 id => "infobox", 3107 id => "infobox",
2775 title => "Uptime", 3108 title => "Uptime",
2776 reply => undef, 3109 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3110 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3119 id => "party",
2787 title => "Party", 3120 title => "Party",
2788 reply => "gsay ", 3121 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3122 tooltip => "Messages and chat related to your party",
2790 }, 3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
2791); 3132);
2792 3133
2793sub cf::client::send_msg { 3134sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3136
2800 3141
2801 # check predefined channels, for the benefit of C 3142 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3143 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3144 $channel = $CHANNEL{$channel};
2804 3145
2805 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3147 $channel = $channel->{id};
2809 3148
2810 } elsif (ref $channel) { 3149 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3153 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3154 }
2817 3155
2818 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2819 } 3157 }
2820 3158
2821 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2822 3160
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3161 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3163 if $color & cf::NDI_DEF;
2827 3164
2828 my $pkt = "msg " 3165 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3166 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3168 );
2832 3169
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3170 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3171}
2870 3172
2871=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2872 3174
2873Sends an ext event to the client. 3175Sends an ext event to the client.
2876 3178
2877sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2879 3181
2880 if ($self->extcmd == 2) { 3182 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3187 }
2886} 3188}
2887 3189
2888=item $client->ext_reply ($msgid, @msg) 3190=item $client->ext_reply ($msgid, @msg)
2889 3191
2893 3195
2894sub cf::client::ext_reply($$@) { 3196sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3197 my ($self, $id, @msg) = @_;
2896 3198
2897 if ($self->extcmd == 2) { 3199 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3201 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3202 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3203 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3205 }
2904} 3206}
2905 3207
2906=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2907 3209
2978 3280
2979 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
2980 if $reply; 3282 if $reply;
2981 3283
2982 } else { 3284 } else {
2983 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2984 } 3286 }
2985 3287
2986 cf::override; 3288 cf::override;
2987 }, 3289 },
2988); 3290);
3008 3310
3009 $coro 3311 $coro
3010} 3312}
3011 3313
3012cf::client->attach ( 3314cf::client->attach (
3013 on_destroy => sub { 3315 on_client_destroy => sub {
3014 my ($ns) = @_; 3316 my ($ns) = @_;
3015 3317
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3319 },
3018); 3320);
3034our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
3035 3337
3036$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
3037 3339
3038$safe->permit_only (Opcode::opset qw( 3340$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3341 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3342 grepstart grepwhile mapstart mapwhile
3041 sort time 3343 sort time
3042)); 3344));
3043 3345
3044# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
3049 3351
3050 cf::object 3352 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3353 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3354 insert remove name archname title slaying race decrease split
3355 value
3053 3356
3054 cf::object::player 3357 cf::object::player
3055 player 3358 player
3056 3359
3057 cf::player 3360 cf::player
3063=cut 3366=cut
3064 3367
3065for ( 3368for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3370 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3072) { 3375) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3378 for @funs;
3077} 3379}
3078 3380
3093 3395
3094 my $qcode = $code; 3396 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
3097 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
3098 local $_; 3403 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3404
3101 my $eval = 3405 my $eval =
3102 "do {\n" 3406 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3409 . $code
3106 . "\n}" 3410 . "\n}"
3107 ; 3411 ;
3108 3412
3413 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
3112 3422
3113 if ($@) { 3423 if ($@) {
3114 warn "$@"; 3424 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3117 } 3427 }
3118 3428
3119 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3120} 3430}
3121 3431
3135=cut 3445=cut
3136 3446
3137sub register_script_function { 3447sub register_script_function {
3138 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
3139 3449
3140 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
3142} 3452}
3143 3453
3144=back 3454=back
3145 3455
3146=cut 3456=cut
3155 # for this (global event?) 3465 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3157 3467
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3469
3160 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3161 3471
3162 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3163 0 < aio_load $path, $facedata
3164 or die "$path: $!";
3165
3166 $facedata = Coro::Storable::thaw $facedata;
3167 3473
3168 $facedata->{version} == 2 3474 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3476
3171 # patch in the exptable 3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3479 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3480 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3483 };
3176 cf::cede_to_tick; 3484 cf::cede_to_tick;
3177 3485
3178 { 3486 {
3179 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3491
3184 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3188 3497
3189 cf::cede_to_tick; 3498 cf::cede_to_tick;
3190 } 3499 }
3191 3500
3192 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
3197 3506
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3510 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3512 }
3204 3513
3205 cf::cede_to_tick; 3514 cf::cede_to_tick;
3206 } 3515 }
3207 } 3516 }
3216 3525
3217 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
3218 } 3527 }
3219 3528
3220 { 3529 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
3224 3531
3225 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3533 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3535
3230 if ($info->{type} & 1) { 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3537 cf::face::set_type $idx, $info->{type};
3245 } else { 3538 } else {
3246 $RESOURCE{$name} = $info; 3539 $RESOURCE{$name} = $info; # unused
3247 } 3540 }
3248 3541
3249 cf::cede_to_tick; 3542 cf::cede_to_tick;
3250 } 3543 }
3251 } 3544 }
3252 3545
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3547
3255 1 3548 1
3256} 3549}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3277 3550
3278register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3552 my ($ns, $want) = @_;
3280 3553
3281 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
3320sub reload_treasures { 3593sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3323} 3596}
3324 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3325sub reload_resources { 3618sub reload_resources {
3326 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3327 3620
3621 reload_exp_table;
3622 reload_materials;
3328 reload_facedata; 3623 reload_facedata;
3624 reload_sound;
3329 reload_archetypes; 3625 reload_archetypes;
3330 reload_regions; 3626 reload_regions;
3331 reload_treasures; 3627 reload_treasures;
3332 3628
3333 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3334}
3335
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342} 3630}
3343 3631
3344sub reload_config { 3632sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3633 trace "reloading config file...\n";
3346 or return;
3347 3634
3348 local $/; 3635 my $config = load_file "$CONFDIR/config";
3349 *CFG = YAML::Load <$fh>; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3350 3638
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3640
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3643
3356 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
3379 3667
3380 seek $fh, 0, 0; 3668 seek $fh, 0, 0;
3381 print $fh $$; 3669 print $fh $$;
3382} 3670}
3383 3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
3384sub main { 3681sub main {
3385 atomic; 3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3690
3387 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3694 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3696 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
3394 }; 3698 };
3395 3699
3396 { 3700 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3398 reload_config; 3712 reload_config;
3399 db_init; 3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
3400 load_extensions; 3723 load_extensions;
3401 3724
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3725 utime time, time, $RUNTIMEFILE;
3406 3726
3407 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3730
3410 EV::loop; 3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
3411} 3743}
3412 3744
3413############################################################################# 3745#############################################################################
3414# initialisation and cleanup 3746# initialisation and cleanup
3415 3747
3416# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
3417BEGIN { 3749BEGIN {
3418 our %SIGWATCHER = (); 3750 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
3422 }; 3754 };
3423 } 3755 }
3424} 3756}
3425 3757
3426sub write_runtime_sync { 3758sub write_runtime_sync {
3759 my $t0 = AE::time;
3760
3427 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3429 3763
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3765
3432 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3433 3767
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3769 or return;
3436 3770
3437 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3452 or return; 3786 or return;
3453 3787
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3789 and return;
3456 3790
3457 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3792
3459 1 3793 1
3460} 3794}
3461 3795
3462our $uuid_lock; 3796our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3805 my $uuid = "$LOCALDIR/uuid";
3472 3806
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3808 or return;
3475 3809
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3818 $uuid_skip = 0;
3478 3819
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3821 and return;
3481 3822
3487 or return; 3828 or return;
3488 3829
3489 aio_rename "$uuid~", $uuid 3830 aio_rename "$uuid~", $uuid
3490 and return; 3831 and return;
3491 3832
3492 warn "uuid file written ($value).\n"; 3833 trace "uuid file written ($value).\n";
3493 3834
3494 1 3835 1
3495 3836
3496} 3837}
3497 3838
3503} 3844}
3504 3845
3505sub emergency_save() { 3846sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3507 3848
3508 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3509 3855
3510 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3511 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3865 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3867 $pl->save;
3520 } 3868 }
3521 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3522 3870
3523 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3876 $map->valid or next;
3527 $map->save; 3877 $map->save;
3528 } 3878 }
3529 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3530 3880
3531 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3534 3886
3535 warn "begin write uuid\n"; 3887 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3888 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 3909 };
3539 3910
3540 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3541} 3912}
3542 3913
3543sub post_cleanup { 3914sub post_cleanup {
3544 my ($make_core) = @_; 3915 my ($make_core) = @_;
3545 3916
3917 IO::AIO::flush;
3918
3546 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 3920 if $make_core;
3548 3921
3549 my $fh = pidfile; 3922 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 3923 unlink $PIDFILE if <$fh> == $$;
3551} 3924}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3945 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3946 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3948 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3949}
3578
3579our $RELOAD; # how many times to reload
3580 3950
3581sub do_reload_perl() { 3951sub do_reload_perl() {
3582 # can/must only be called in main 3952 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3584 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3585 return; 3955 return;
3586 } 3956 }
3587 3957
3588 return if $RELOAD++; 3958 return if $RELOAD++;
3589 3959
3960 my $t1 = AE::time;
3961
3590 while ($RELOAD) { 3962 while ($RELOAD) {
3591 warn "reloading..."; 3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3592 3965
3593 warn "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3594 3967
3595 cf::sync_job { 3968 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3969 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 3970
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 while (IO::AIO::nreqs || BDB::nreqs) {
3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608 }
3609
3610 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 3973 %EXT_CORO = ();
3613 3974
3614 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3615 %COMMAND = (); 3976 %COMMAND = ();
3616 3977
3617 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 3979 %EXTCMD = ();
3619 %EXTICMD = (); 3980 %EXTICMD = ();
3620 3981
3621 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3624 3985
3625 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3626 eval { 3987 eval {
3627 $cb->($pkg); 3988 $cb->($pkg);
3628 1 3989 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3630 } 3991 }
3631 3992
3632 warn "... clearing $pkg"; 3993 trace "... clearing $pkg";
3633 clear_package $pkg; 3994 clear_package $pkg;
3634 } 3995 }
3635 3996
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 4000
3640 warn "... unloading $k"; 4001 trace "... unloading $k";
3641 delete $INC{$k}; 4002 delete $INC{$k};
3642 4003
3643 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3645 4006
3648 } 4009 }
3649 4010
3650 clear_package $k; 4011 clear_package $k;
3651 } 4012 }
3652 4013
3653 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 4015 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 4017
3657 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 4021
3661 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4023 # and global variables created in xs
3663 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3664 4025
3665 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3666 4027
3667 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3668 require cf; 4029 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3670 4031
3671 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4033 cf::reload_config;
3673 4034
3674 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4036 cf::load_extensions;
3676 4037
4038 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3683 4046
3684 warn "leaving sync_job"; 4047 cf::_post_init 1;
4048
4049 trace "perl_reload: leaving sync_job";
3685 4050
3686 1 4051 1
3687 } or do { 4052 } or do {
3688 warn $@; 4053 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4055 };
3691 4056
3692 warn "reloaded";
3693 --$RELOAD; 4057 --$RELOAD;
3694 } 4058 }
4059
4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3695}; 4062};
3696 4063
3697our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3698 4065
3699sub reload_perl() { 4066sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3702 4069
4070 $RELOAD_WATCHER ||= cf::async {
4071 Coro::AIO::aio_wait cache_extensions;
4072
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4074 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
4076 };
3706 }; 4077 };
3707} 4078}
3708 4079
3709register_command "reload" => sub { 4080register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3716 reload_perl; 4087 reload_perl;
3717 }; 4088 };
3718 } 4089 }
3719}; 4090};
3720 4091
3721unshift @INC, $LIBDIR; 4092#############################################################################
3722 4093
3723my $bug_warning = 0; 4094my $bug_warning = 0;
3724 4095
3725our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3727 4098
3728sub wait_for_tick { 4099sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 4101
3731 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 4104 $signal->wait;
3734} 4105}
3735 4106
3736sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4109
3739 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4112 $signal->wait;
3742} 4113}
3748 return; 4119 return;
3749 } 4120 }
3750 4121
3751 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3752 4123
4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4125
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4128 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4130 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3759 }; 4132 };
3760 } 4133 }
3761 4134
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4136 $sig->send;
3771 4144
3772 if (0) { 4145 if (0) {
3773 if ($NEXT_TICK) { 4146 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4147 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4149 debug "jitter $JITTER\n";#d#
3777 } 4150 }
3778 } 4151 }
3779} 4152}
3780 4153
3781{ 4154{
3782 # configure BDB 4155 # configure BDB
3783 4156
3784 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4158 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4159 $AnyEvent::BDB::WATCHER->priority (1);
3787 4160
3788 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
3826 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3827 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3828 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
3829} 4202}
3830 4203
3831my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3832 4206
3833sub _log_backtrace { 4207sub _log_backtrace {
3834 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3835 4209
3836 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3837 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3838 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3839 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3840 ++$_log_backtrace; 4218 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
3842 async { 4220 async {
3843 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
3844 4222
3864 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3865 --$_log_backtrace; 4243 --$_log_backtrace;
3866 }; 4244 };
3867 } else { 4245 } else {
3868 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3870 } 4248 }
3871} 4249}
3872 4250
3873# load additional modules 4251# load additional modules
3874use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3875 4254
3876END { cf::emergency_save } 4255END { cf::emergency_save }
3877 4256
38781 42571
3879 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines