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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 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 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
… …
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 75
68$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" };
69 78
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
74 85
75our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
85our $DATADIR = datadir; 99our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
89our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
95our %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;
96 120
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 123our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
101 125
102our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 129our $DB_ENV;
106 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
107our %CFG; 133our %CFG;
108 134
109our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 136our $RUNTIME;
111our $NOW; 137our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 148our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
124 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 :)
155
125binmode STDOUT; 156binmode STDOUT;
126binmode STDERR; 157binmode STDERR;
127 158
128# read virtual server time, if available 159# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
133} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
134 167
135mkdir $_ 168mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 170
138our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
139 172
140sub 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::"} };
141 189
142############################################################################# 190#############################################################################
143 191
144=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
145 193
… …
187from wherever your confdir points to. 235from wherever your confdir points to.
188 236
189=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
190 238
191These 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
192returns 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
193per 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.
194 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
195=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
196 249
197This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
198C<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
199that call. 252that call.
200 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
201=back 260=back
202 261
203=cut 262=cut
204 263
205BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
206 *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 {
207 my $msg = join "", @_; 271 my $msg = join "", @_;
208 272
209 $msg .= "\n" 273 $msg .= "\n"
210 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
211 275
212 $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;
213 277
214 LOG llevError, $msg; 278 LOG llevWarn, $msg;
215 }; 279};
216}
217 280
218$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
220 283
221 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 288 return;#d#
224 }#d# 289 }#d#
225 290
226 # kill coroutine otherwise 291 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 292 Coro::terminate
229}; 293};
230
231$SIG{__DIE__} = sub { }; #d#?
232 294
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
243for my $pkg (qw( 305for my $pkg (qw(
244 cf::global cf::attachable 306 cf::global cf::attachable
245 cf::object cf::object::player 307 cf::object cf::object::player
246 cf::client cf::player 308 cf::client cf::player
247 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
248 cf::map cf::party cf::region 311 cf::party cf::region
249)) { 312)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 314}
253 315
254$EV::DIED = sub { 316$EV::DIED = sub {
255 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
256}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
257 324
258############################################################################# 325#############################################################################
259 326
260=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
261 328
… …
282 $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;
283 $d 350 $d
284 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
285} 352}
286 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
287=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
288 369
289Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
290 371
291=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
297our $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
298 379
299sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 445=item cf::lock_wait $string
303 446
304Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
305 448
306=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
307 450
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
311returned. 454returned.
312 455
313Locks 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
314deadlocked coro. 457deadlocked coro.
… …
320 463
321Return 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.
322 465
323=cut 466=cut
324 467
325our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 469
328sub lock_wait($) { 470sub lock_wait($) {
329 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 472}
342 473
343sub lock_acquire($) { 474sub lock_acquire($) {
344 my ($key) = @_; 475 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 476}
358 477
359sub lock_active($) { 478sub lock_active($) {
360 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 480}
364 481
365sub freeze_mainloop { 482sub freeze_mainloop {
366 tick_inhibit_inc; 483 tick_inhibit_inc;
367 484
368 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
369} 486}
370 487
371=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
372 489
373Like 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
374get spread over timer. 491get spread over time.
375 492
376=cut 493=cut
377 494
378sub periodic($$) { 495sub periodic($$) {
379 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
383 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
384} 501}
385 502
386=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
387 504
388Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
389This 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
390of 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.
391 512
392The 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
393used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
394 515
395Useful for short background jobs. 516Useful for short background jobs.
396 517
397=cut 518=cut
398 519
399our @SLOT_QUEUE; 520our @SLOT_QUEUE;
400our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
401 523
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
405 527
406 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
407 530
408 while () { 531 while () {
409 next_job: 532 next_job:
533
410 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 535
412 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 540 $job->[2]->send;
416 Coro::cede; 541 Coro::cede;
417 goto next_job; 542 goto next_job;
418 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 545 }
420 } 546 }
421 547
422 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
423 # 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
424 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 551 $signal->wait;
426 } else { 552 } else {
553 $busy = 0;
427 Coro::schedule; 554 Coro::schedule;
428 } 555 }
429 } 556 }
430}; 557};
431 558
432sub get_slot($;$$) { 559sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
434 561
435 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
436 563
437 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
438 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
439 567
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
468=cut 596=cut
469 597
470sub sync_job(&) { 598sub sync_job(&) {
471 my ($job) = @_; 599 my ($job) = @_;
472 600
473 if ($Coro::current == $Coro::main) { 601 if (in_main) {
474 my $time = EV::time; 602 my $time = AE::time;
475 603
476 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
478 606
479 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
480 608
481 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
482 610
483 my $busy = 1; 611 my $busy = 1;
484 my @res; 612 my @res;
485 613
486 (async { 614 (async {
487 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 616 @res = eval { $job->() };
489 warn $@ if $@; 617 error $@ if $@;
490 undef $busy; 618 undef $busy;
491 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
492 620
493 while ($busy) { 621 while ($busy) {
494 if (Coro::nready) { 622 if (Coro::nready) {
… …
496 } else { 624 } else {
497 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
498 } 626 }
499 } 627 }
500 628
501 my $time = EV::time - $time; 629 my $time = AE::time - $time;
502 630
503 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
504 632
505 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
506 } else { 634 } else {
… …
528 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
529 657
530 $coro 658 $coro
531} 659}
532 660
533=item fork_call { }, $args 661=item fork_call { }, @args
534 662
535Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
536process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
537Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 666never block itself or use any form of event handling.
539 667
540=cut 668=cut
541 669
670sub post_fork {
671 reset_signals;
672}
673
542sub fork_call(&@) { 674sub fork_call(&@) {
543 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
544 676
545 # 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,
546 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
548 680
549 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
550 reset_signals; 682 cf::post_fork;
551 &$cb 683 &$cb
552 }, @args; 684 } @args;
553 685
554 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 )
555} 698}
556 699
557=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
558 701
559=cut 702=cut
… …
596within each server. 739within each server.
597 740
598=cut 741=cut
599 742
600sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
601 my ($name) = @_; 747 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
603 749
604 eval { 750 eval {
605 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
615} 761}
616 762
617our $DB; 763our $DB;
618 764
619sub db_init { 765sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
622 };
623} 767}
624 768
625sub db_get($$) { 769sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
627 771
628 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
629 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
630 776
631 $! ? () 777 $! ? ()
632 : $data 778 : $data
633 }
634} 779}
635 780
636sub db_put($$$) { 781sub db_put($$$) {
637 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
666 811
667 my @data; 812 my @data;
668 my $md5; 813 my $md5;
669 814
670 for (0 .. $#$src) { 815 for (0 .. $#$src) {
671 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
672 or Carp::croak "$src->[$_]: $!";
673 } 817 }
674 818
675 # if processing is expensive, check 819 # if processing is expensive, check
676 # checksum first 820 # checksum first
677 if (1) { 821 if (1) {
… …
694 838
695 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 840 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
698 842
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 844
701 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
704 848
… …
714 858
715=cut 859=cut
716 860
717sub datalog($@) { 861sub datalog($@) {
718 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 864}
721 865
722=back 866=back
723 867
724=cut 868=cut
725 869
726############################################################################# 870#############################################################################
727 871
728=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
729 873
730Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
733 877
734In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
786 930
787Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
789 933
790Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
792 936
793These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
794 938
795=over 4 939=over 4
… …
919 1063
920 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 1066
923 } elsif (ref $type) { 1067 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
925 1069
926 } else { 1070 } else {
927 shift @arg; 1071 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
929 } 1073 }
930 } 1074 }
931} 1075}
932 1076
933sub _object_attach { 1077sub _object_attach {
… …
943 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
944 } 1088 }
945 1089
946 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
947 } else { 1091 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1093 }
950 1094
951 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
952} 1096}
953 1097
… …
1012 1156
1013 for (@$callbacks) { 1157 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1015 1159
1016 if ($@) { 1160 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1162 override;
1020 } 1163 }
1021 1164
1022 return 1 if $override; 1165 return 1 if $override;
1023 } 1166 }
… …
1086 1229
1087sub reattach { 1230sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1232 my ($obj) = @_;
1090 1233
1234 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1236
1093 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1094 1238
1095 @$registry = (); 1239 @$registry = ();
1096 1240
… …
1101 for (@$attach) { 1245 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1104 } 1248 }
1105 } else { 1249 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1251 }
1108 } 1252 }
1109} 1253}
1110 1254
1111cf::attachable->attach ( 1255cf::attachable->attach (
… …
1138 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1139 1283
1140 sync_job { 1284 sync_job {
1141 if (length $$rdata) { 1285 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1145 1290
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 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 }
1150 aio_close $fh; 1298 aio_close $fh;
1151 1299
1152 if (@$objs) { 1300 if (@$objs) {
1153 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) {
1154 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1157 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 }
1158 aio_close $fh; 1309 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1311 }
1161 } else { 1312 } else {
1162 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1163 } 1314 }
1164 1315
1165 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1320 } else {
1167 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1168 } 1322 }
1169 } else { 1323 } else {
1170 aio_unlink $filename; 1324 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1172 } 1326 }
… …
1196 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1351 $av = $st->{objs};
1198 } 1352 }
1199 1353
1200 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1203 1358
1204 ($data, $av) 1359 ($data, $av)
1205} 1360}
1206 1361
1207=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1263 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1264 1419
1265 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1266} 1421}
1267 1422
1423use File::Glob ();
1424
1268cf::player->attach ( 1425cf::player->attach (
1269 on_command => sub { 1426 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1271 1428
1272 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1273 or return; 1430 or return;
1274 1431
… …
1297 1454
1298 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1456 if $reply;
1300 1457
1301 } else { 1458 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1460 }
1304 1461
1305 cf::override; 1462 cf::override;
1306 }, 1463 },
1307); 1464);
1308 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
1309sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1310 cf::sync_job { 1482 cf::sync_job {
1311 my %todo; 1483 my %todo;
1312 1484
1313 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1486 next unless -r $path;
… …
1332 1504
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1507
1336 $ext{source} = 1508 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1339 . $source 1511 . $source
1340 . "\n};\n1"; 1512 . "\n};\n1";
1341 1513
1342 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1343 } 1515 }
1344 1516
1517 my $pass = 0;
1345 my %done; 1518 my %done;
1346 while (%todo) { 1519 while (%todo) {
1347 my $progress; 1520 my $progress;
1348 1521
1522 ++$pass;
1523
1524 ext:
1349 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1527 next ext
1352 unless exists $done{$_}; 1528 unless exists $done{$_};
1353 } 1529 }
1354 1530
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1532
1357 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1537
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1539 if exists $v->{meta}{mandatory};
1365 1540
1366 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;
1367 } 1550 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1551 }
1373 1552
1374 skip: 1553 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 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 }
1377 } 1563 }
1378 }; 1564 };
1379} 1565}
1380 1566
1381############################################################################# 1567#############################################################################
1382 1568
1383=back 1569=back
1384 1570
1385=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1386 1572
1387Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1388 1574
1389=cut 1575=cut
1390 1576
1391package cf::player; 1577package cf::player;
1392 1578
… …
1435 1621
1436sub exists($) { 1622sub exists($) {
1437 my ($login) = @_; 1623 my ($login) = @_;
1438 1624
1439 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1441} 1627}
1442 1628
1443sub find($) { 1629sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1631 my $login = $_[0];
… …
1465 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1466 } 1652 }
1467 } 1653 }
1468} 1654}
1469 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
1470sub save($) { 1669sub save($) {
1471 my ($pl) = @_; 1670 my ($pl) = @_;
1472 1671
1473 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1474 1673
… …
1479 1678
1480 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1482 1681
1483 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];
1484 1686
1485 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1688 cf::cede_to_tick;
1487} 1689}
1488 1690
… …
1520 my ($pl) = @_; 1722 my ($pl) = @_;
1521 1723
1522 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1523 1725
1524 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1728
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1528 $pl->deactivate; 1730 $pl->deactivate;
1731
1529 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;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1532 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1533 1737
1534 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1536 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1590 \@logins 1794 \@logins
1591} 1795}
1592 1796
1593=item $player->maps 1797=item $player->maps
1594 1798
1799=item cf::player::maps $login
1800
1595Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1596player. May block. 1802player. May block.
1597 1803
1598=cut 1804=cut
1599 1805
… …
1616 } 1822 }
1617 1823
1618 \@paths 1824 \@paths
1619} 1825}
1620 1826
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1828
1623Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1830
1714=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1715 1832
1716Sends an ext reply to the player. 1833Sends an ext reply to the player.
1717 1834
… …
1749 1866
1750=cut 1867=cut
1751 1868
1752sub find_by_path($) { 1869sub find_by_path($) {
1753 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1754 1873
1755 my ($match, $specificity); 1874 my ($match, $specificity);
1756 1875
1757 for my $region (list) { 1876 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
… …
1787sub generate_random_map { 1906sub generate_random_map {
1788 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1789 1908
1790 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
1791 1910
1792 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1801 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1802 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1803 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1804 (cf::region::find $rmp->{region}), $rmp->{custom}
1805 )
1806} 1912}
1807 1913
1808=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1809 1915
1810Register 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
… …
1815 1921
1816sub register { 1922sub register {
1817 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1924 my $pkg = caller;
1819 1925
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1927
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1929}
1825 1930
1826# also paths starting with '/' 1931# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1933
1829sub thawer_merge { 1934sub thawer_merge {
1830 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1831 1936
1832 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1837} 1942}
1838 1943
1839sub normalise { 1944sub normalise {
1840 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1841 1946
1842 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1843 1948
1844 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1845 1950
1846 # map plan: 1951 # map plan:
1847 # 1952 #
… …
1862 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1863 $path = "$base/$path"; 1968 $path = "$base/$path";
1864 } 1969 }
1865 1970
1866 for ($path) { 1971 for ($path) {
1867 redo if s{//}{/};
1868 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1869 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1870 } 1974 }
1871 1975
1872 $path 1976 $path
… …
1886 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1887 return $self; 1991 return $self;
1888 } 1992 }
1889 } 1993 }
1890 1994
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 1996 ()
1893} 1997}
1894 1998
1999# may re-bless or do other evil things
1895sub init { 2000sub init {
1896 my ($self) = @_; 2001 my ($self) = @_;
1897 2002
1898 $self 2003 $self
1899} 2004}
… …
1928sub uniq_path { 2033sub uniq_path {
1929 my ($self) = @_; 2034 my ($self) = @_;
1930 2035
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1933}
1934
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942} 2038}
1943 2039
1944sub decay_objects { 2040sub decay_objects {
1945 my ($self) = @_; 2041 my ($self) = @_;
1946 2042
… …
2028 2124
2029sub find; 2125sub find;
2030sub find { 2126sub find {
2031 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2032 2128
2129 cf::cede_to_tick;
2130
2033 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
2034 2132
2035 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2135
2038 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
2043 or return; 2138 or return;
2044 2139
2045 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
2046 2141
… …
2058 2153
2059 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
2060 } 2155 }
2061} 2156}
2062 2157
2063sub pre_load { } 2158sub pre_load { }
2064sub post_load { } 2159#sub post_load { } # XS
2065 2160
2066sub load { 2161sub load {
2067 my ($self) = @_; 2162 my ($self) = @_;
2068 2163
2069 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2181 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2182 $f->skip_block;
2088 $self->_load_objects ($f) 2183 $self->_load_objects ($f)
2089 or return; 2184 or return;
2090 2185
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2186 $self->post_load_original
2092 if delete $self->{load_original}; 2187 if delete $self->{load_original};
2093 2188
2094 if (my $uniq = $self->uniq_path) { 2189 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2190 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2191 unless (aio_stat $uniq) {
… …
2114 unless ($self->{deny_activate}) { 2209 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2210 $self->decay_objects;
2116 $self->fix_auto_apply; 2211 $self->fix_auto_apply;
2117 $self->update_buttons; 2212 $self->update_buttons;
2118 cf::cede_to_tick; 2213 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2214 $self->activate;
2122 } 2215 }
2123 2216
2124 $self->{last_save} = $cf::RUNTIME; 2217 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2218 $self->last_access ($cf::RUNTIME);
2126 2219
2127 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2128 } 2221 }
2129 2222
2130 $self->post_load; 2223 $self->post_load;
2131}
2132 2224
2225 1
2226}
2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
2133sub customise_for { 2231sub customise_for {
2134 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2135 2233
2136 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2235 if $self->per_player;
… …
2153 or next; 2251 or next;
2154 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2155 or next; 2253 or next;
2156 $neigh->load; 2254 $neigh->load;
2157 2255
2256 # now find the diagonal neighbours
2158 push @neigh, 2257 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2260 }
2162 2261
… …
2169} 2268}
2170 2269
2171sub find_sync { 2270sub find_sync {
2172 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2173 2272
2174 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2175} 2277}
2176 2278
2177sub do_load_sync { 2279sub do_load_sync {
2178 my ($map) = @_; 2280 my ($map) = @_;
2179 2281
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2182 2284
2183 cf::sync_job { $map->load }; 2285 $map->load;
2184} 2286}
2185 2287
2186our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2188 2290
… …
2214 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2215 2317
2216 () 2318 ()
2217} 2319}
2218 2320
2321# common code, used by both ->save and ->swapout
2219sub save { 2322sub _save {
2220 my ($self) = @_; 2323 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2324
2224 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2225 2326
2226 return unless $self->dirty; 2327 return unless $self->dirty;
2227 2328
… …
2247 } else { 2348 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2350 }
2250} 2351}
2251 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2252sub swap_out { 2361sub swap_out {
2253 my ($self) = @_; 2362 my ($self) = @_;
2254 2363
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2365
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2263 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2265 2420
2266 $self->deactivate; 2421 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2423 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2424
2314 $self->unlink_save; 2425 $self->unlink_save;
2315 $self->destroy; 2426 $self->destroy;
2316} 2427}
2317 2428
… …
2325 2436
2326 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2327 2438
2328 $self->unlink_save; 2439 $self->unlink_save;
2329 2440
2330 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2446
… …
2392 : normalise $_ 2503 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2504 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2505 ]
2395} 2506}
2396 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
2529 s/\.map$// or next;
2530 utf8::decode $_;
2531 push @maps, "$dir/$_";
2532 }
2533
2534 push @dirs, map "$dir/$_", @$dirs;
2535 }
2536
2537 \@maps
2538}
2539
2397=back 2540=back
2398 2541
2399=head3 cf::object 2542=head3 cf::object
2400 2543
2401=cut 2544=cut
… …
2466 2609
2467our $SAY_CHANNEL = { 2610our $SAY_CHANNEL = {
2468 id => "say", 2611 id => "say",
2469 title => "Map", 2612 title => "Map",
2470 reply => "say ", 2613 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2614 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2615};
2473 2616
2474our $CHAT_CHANNEL = { 2617our $CHAT_CHANNEL = {
2475 id => "chat", 2618 id => "chat",
2476 title => "Chat", 2619 title => "Chat",
… …
2531 2674
2532=item $player_object->enter_link 2675=item $player_object->enter_link
2533 2676
2534Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2535 2678
2536The player should be reasonably safe there for short amounts of time. You 2679The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2681though, as the player cannot control the character while it is on the link
2682map.
2538 2683
2539Will never block. 2684Will never block.
2540 2685
2541=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
2542 2687
… …
2562sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2563 my ($self) = @_; 2708 my ($self) = @_;
2564 2709
2565 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2566 2711
2712 ++$self->{_link_recursion};
2713
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2715
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2571 2718
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2720}
2574 2721
2575sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2577 2724
… …
2594 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
2596 2743
2597 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
2600 2747
2601 $map->load; 2748 $map->load;
2602 $map->load_neighbours; 2749 $map->load_neighbours;
2603 2750
2604 return unless $self->contr->active; 2751 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2752
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2609} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2610 2760
2761}
2762
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2764
2613Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2769be called at the end of this process.
2618 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2619=cut 2774=cut
2620 2775
2621our $GOTOGEN; 2776our $GOTOGEN;
2622 2777
2623sub cf::object::player::goto { 2778sub cf::object::player::goto {
2624 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2625 2786
2626 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2628 2789
2629 $self->enter_link; 2790 $self->enter_link;
… …
2653 my $map = eval { 2814 my $map = eval {
2654 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2655 2816
2656 if ($map) { 2817 if ($map) {
2657 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2658 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2659 } else { 2820 } else {
2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2661 } 2822 }
2662 2823
2663 $map 2824 $map
… …
2671 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2672 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2673 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2674 } 2835 }
2675 2836
2676 $done->() if $done; 2837 $done->($self) if $done;
2677 })->prio (1); 2838 })->prio (1);
2678} 2839}
2679 2840
2680=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2681 2842
… …
2769 $self->contr->savebed ($map, $x, $y) 2930 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2931 if $exit->flag (cf::FLAG_DAMNED);
2771 2932
2772 1 2933 1
2773 }) { 2934 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2939
2779 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2780 $self->leave_link; 2941 $self->leave_link;
2781 } 2942 }
2782 })->prio (1); 2943 })->prio (1);
2783} 2944}
2784 2945
… …
2796sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
2798 2959
2799 utf8::encode $text; 2960 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2962}
2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2801} 2987}
2802 2988
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2990
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2991Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2809 2995
2810=cut 2996=cut
2811 2997
2812# non-persistent channels (usually the info channel) 2998# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
2814 "c/identify" => { 3006 "c/identify" => {
2815 id => "infobox", 3007 id => "infobox",
2816 title => "Identify", 3008 title => "Identify",
2817 reply => undef, 3009 reply => undef,
2818 tooltip => "Items recently identified", 3010 tooltip => "Items recently identified",
… …
2820 "c/examine" => { 3012 "c/examine" => {
2821 id => "infobox", 3013 id => "infobox",
2822 title => "Examine", 3014 title => "Examine",
2823 reply => undef, 3015 reply => undef,
2824 tooltip => "Signs and other items you examined", 3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 3023 },
2826 "c/book" => { 3024 "c/book" => {
2827 id => "infobox", 3025 id => "infobox",
2828 title => "Book", 3026 title => "Book",
2829 reply => undef, 3027 reply => undef,
… …
2845 id => "infobox", 3043 id => "infobox",
2846 title => "Body Parts", 3044 title => "Body Parts",
2847 reply => undef, 3045 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 3046 tooltip => "Shows which body parts you posess and are available",
2849 }, 3047 },
3048 "c/statistics" => {
3049 id => "infobox",
3050 title => "Statistics",
3051 reply => undef,
3052 tooltip => "Shows your primary statistics",
3053 },
3054 "c/skills" => {
3055 id => "infobox",
3056 title => "Skills",
3057 reply => undef,
3058 tooltip => "Shows your experience per skill and item power",
3059 },
3060 "c/shopitems" => {
3061 id => "infobox",
3062 title => "Shop Items",
3063 reply => undef,
3064 tooltip => "Shows the items currently for sale in this shop",
3065 },
3066 "c/resistances" => {
3067 id => "infobox",
3068 title => "Resistances",
3069 reply => undef,
3070 tooltip => "Shows your resistances",
3071 },
3072 "c/pets" => {
3073 id => "infobox",
3074 title => "Pets",
3075 reply => undef,
3076 tooltip => "Shows information abotu your pets/a specific pet",
3077 },
3078 "c/perceiveself" => {
3079 id => "infobox",
3080 title => "Perceive Self",
3081 reply => undef,
3082 tooltip => "You gained detailed knowledge about yourself",
3083 },
2850 "c/uptime" => { 3084 "c/uptime" => {
2851 id => "infobox", 3085 id => "infobox",
2852 title => "Uptime", 3086 title => "Uptime",
2853 reply => undef, 3087 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 3088 tooltip => "How long the server has been running since last restart",
… …
2863 id => "party", 3097 id => "party",
2864 title => "Party", 3098 title => "Party",
2865 reply => "gsay ", 3099 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 3100 tooltip => "Messages and chat related to your party",
2867 }, 3101 },
3102 "c/death" => {
3103 id => "death",
3104 title => "Death",
3105 reply => undef,
3106 tooltip => "Reason for and more info about your most recent death",
3107 },
3108 "c/say" => $SAY_CHANNEL,
3109 "c/chat" => $CHAT_CHANNEL,
2868); 3110);
2869 3111
2870sub cf::client::send_msg { 3112sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 3113 my ($self, $channel, $msg, $color, @extra) = @_;
2872 3114
2873 $msg = $self->pl->expand_cfpod ($msg); 3115 $msg = $self->pl->expand_cfpod ($msg)
3116 unless $color & cf::NDI_VERBATIM;
2874 3117
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 3118 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 3119
2877 # check predefined channels, for the benefit of C 3120 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 3121 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 3122 $channel = $CHANNEL{$channel};
2880 3123
2881 $self->ext_msg (channel_info => $channel) 3124 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 3125 $channel = $channel->{id};
2885 3126
2886 } elsif (ref $channel) { 3127 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 3128 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 3129 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 3130 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 3131 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 3132 }
2893 3133
2894 $channel = $channel->{id}; 3134 $channel = $channel->{id};
2895 } 3135 }
2896 3136
2897 return unless @extra || length $msg; 3137 return unless @extra || length $msg;
2898 3138
2899 if ($self->can_msg) {
2900 # default colour, mask it out 3139 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3140 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 3141 if $color & cf::NDI_DEF;
2903 3142
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3143 my $pkt = "msg "
3144 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 3146 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 3147
2918 $color &= cf::NDI_COLOR_MASK; 3148 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 3149}
2932 3150
2933=item $client->ext_msg ($type, @msg) 3151=item $client->ext_msg ($type, @msg)
2934 3152
2935Sends an ext event to the client. 3153Sends an ext event to the client.
… …
2938 3156
2939sub cf::client::ext_msg($$@) { 3157sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3158 my ($self, $type, @msg) = @_;
2941 3159
2942 if ($self->extcmd == 2) { 3160 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 3162 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 3163 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3165 }
2948} 3166}
2949 3167
2950=item $client->ext_reply ($msgid, @msg) 3168=item $client->ext_reply ($msgid, @msg)
2951 3169
… …
2955 3173
2956sub cf::client::ext_reply($$@) { 3174sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3175 my ($self, $id, @msg) = @_;
2958 3176
2959 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3179 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3180 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3181 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3183 }
2966} 3184}
2967 3185
2968=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
2969 3187
… …
3040 3258
3041 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3042 if $reply; 3260 if $reply;
3043 3261
3044 } else { 3262 } else {
3045 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3046 } 3264 }
3047 3265
3048 cf::override; 3266 cf::override;
3049 }, 3267 },
3050); 3268);
… …
3070 3288
3071 $coro 3289 $coro
3072} 3290}
3073 3291
3074cf::client->attach ( 3292cf::client->attach (
3075 on_destroy => sub { 3293 on_client_destroy => sub {
3076 my ($ns) = @_; 3294 my ($ns) = @_;
3077 3295
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3297 },
3080); 3298);
… …
3096our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
3097 3315
3098$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
3099 3317
3100$safe->permit_only (Opcode::opset qw( 3318$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3319 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3320 grepstart grepwhile mapstart mapwhile
3103 sort time 3321 sort time
3104)); 3322));
3105 3323
3106# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
… …
3110The following functions and methods are available within a safe environment: 3328The following functions and methods are available within a safe environment:
3111 3329
3112 cf::object 3330 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3331 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3332 insert remove name archname title slaying race decrease split
3333 value
3115 3334
3116 cf::object::player 3335 cf::object::player
3117 player 3336 player
3118 3337
3119 cf::player 3338 cf::player
… …
3125=cut 3344=cut
3126 3345
3127for ( 3346for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3347 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3348 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3351 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3134) { 3353) {
3135 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3138 for @funs; 3356 for @funs;
3139} 3357}
3140 3358
… …
3155 3373
3156 my $qcode = $code; 3374 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
3159 3377
3378 %vars = (_dummy => 0) unless %vars;
3379
3380 my @res;
3160 local $_; 3381 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3382
3163 my $eval = 3383 my $eval =
3164 "do {\n" 3384 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3387 . $code
3168 . "\n}" 3388 . "\n}"
3169 ; 3389 ;
3170 3390
3391 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
3174 3400
3175 if ($@) { 3401 if ($@) {
3176 warn "$@"; 3402 warn "$@",
3177 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3179 } 3405 }
3180 3406
3181 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3182} 3408}
3183 3409
… …
3197=cut 3423=cut
3198 3424
3199sub register_script_function { 3425sub register_script_function {
3200 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
3201 3427
3202 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
3204} 3430}
3205 3431
3206=back 3432=back
3207 3433
3208=cut 3434=cut
… …
3217 # for this (global event?) 3443 # for this (global event?)
3218 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3219 3445
3220 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3221 3447
3222 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3223 3449
3224 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3225 0 < aio_load $path, $facedata
3226 or die "$path: $!";
3227
3228 $facedata = Coro::Storable::thaw $facedata;
3229 3451
3230 $facedata->{version} == 2 3452 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3454
3233 # patch in the exptable 3455 # patch in the exptable
3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3234 $facedata->{resource}{"res/exp_table"} = { 3457 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC, 3458 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3459 data => $exp_table,
3460 hash => (Digest::MD5::md5 $exp_table),
3237 }; 3461 };
3238 cf::cede_to_tick; 3462 cf::cede_to_tick;
3239 3463
3240 { 3464 {
3241 my $faces = $facedata->{faceinfo}; 3465 my $faces = $facedata->{faceinfo};
… …
3243 while (my ($face, $info) = each %$faces) { 3467 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3469
3246 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3250 3475
3251 cf::cede_to_tick; 3476 cf::cede_to_tick;
3252 } 3477 }
3253 3478
3254 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
… …
3259 3484
3260 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3261 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3263 } else { 3488 } else {
3264 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3265 } 3490 }
3266 3491
3267 cf::cede_to_tick; 3492 cf::cede_to_tick;
3268 } 3493 }
3269 } 3494 }
… …
3278 3503
3279 cf::anim::invalidate_all; # d'oh 3504 cf::anim::invalidate_all; # d'oh
3280 } 3505 }
3281 3506
3282 { 3507 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3508 my $res = $facedata->{resource};
3286 3509
3287 while (my ($name, $info) = each %$res) { 3510 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3511 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3513
3292 if ($info->{type} & 1) { 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3307 } else { 3516 } else {
3308 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3309 } 3518 }
3310 3519
3311 cf::cede_to_tick; 3520 cf::cede_to_tick;
3312 } 3521 }
3313 } 3522 }
3314 3523
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3316 3525
3317 1 3526 1
3318} 3527}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3339 3528
3340register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3341 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3342 3531
3343 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
… …
3382sub reload_treasures { 3571sub reload_treasures {
3383 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3384 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3385} 3574}
3386 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3387sub reload_resources { 3596sub reload_resources {
3388 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3389 3598
3599 reload_exp_table;
3600 reload_materials;
3390 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3391 reload_archetypes; 3603 reload_archetypes;
3392 reload_regions; 3604 reload_regions;
3393 reload_treasures; 3605 reload_treasures;
3394 3606
3395 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3396}
3397
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404} 3608}
3405 3609
3406sub reload_config { 3610sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3611 trace "reloading config file...\n";
3408 or return;
3409 3612
3410 local $/; 3613 my $config = load_file "$CONFDIR/config";
3411 *CFG = YAML::Load <$fh>; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3412 3616
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3618
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3621
3418 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
… …
3422 }; 3626 };
3423 warn $@ if $@; 3627 warn $@ if $@;
3424 } 3628 }
3425} 3629}
3426 3630
3631sub pidfile() {
3632 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3633 or die "$PIDFILE: $!";
3634 flock $fh, &Fcntl::LOCK_EX
3635 or die "$PIDFILE: flock: $!";
3636 $fh
3637}
3638
3639# make sure only one server instance is running at any one time
3640sub atomic {
3641 my $fh = pidfile;
3642
3643 my $pid = <$fh>;
3644 kill 9, $pid if $pid > 0;
3645
3646 seek $fh, 0, 0;
3647 print $fh $$;
3648}
3649
3650sub main_loop {
3651 trace "EV::loop starting\n";
3652 if (1) {
3653 EV::loop;
3654 }
3655 trace "EV::loop returned\n";
3656 goto &main_loop unless $REALLY_UNLOOP;
3657}
3658
3427sub main { 3659sub main {
3660 cf::init_globals; # initialise logging
3661
3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666
3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3668
3428 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3671 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3672 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3673 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3674 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3675 })->prio (Coro::PRIO_MAX);
3435 }; 3676 };
3436 3677
3437 { 3678 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3679
3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3689 reload_resources;
3439 reload_config; 3690 reload_config;
3440 db_init; 3691 db_init;
3692
3693 cf::init_uuid;
3694 cf::init_signals;
3695 cf::init_skills;
3696
3697 cf::init_beforeplay;
3698
3699 atomic;
3700
3441 load_extensions; 3701 load_extensions;
3442 3702
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3703 utime time, time, $RUNTIMEFILE;
3704
3705 # no (long-running) fork's whatsoever before this point(!)
3706 use POSIX ();
3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3708
3709 cf::_post_init 0;
3444 } 3710 };
3445 3711
3446 EV::loop; 3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3720 goto &main_loop;
3447} 3721}
3448 3722
3449############################################################################# 3723#############################################################################
3450# initialisation and cleanup 3724# initialisation and cleanup
3451 3725
3452# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3453BEGIN { 3727BEGIN {
3454 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3458 }; 3732 };
3459 } 3733 }
3460} 3734}
3461 3735
3462sub write_runtime_sync { 3736sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3737 my $t0 = AE::time;
3464 3738
3465 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3467 3741
3468 IO::AIO::aio_utime $runtime, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3743
3470 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3471 3745
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3747 or return;
3474 3748
3475 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3761 aio_utime $fh, undef, undef;
3488 3762
3489 close $fh 3763 close $fh
3490 or return; 3764 or return;
3491 3765
3492 aio_rename "$runtime~", $runtime 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3767 and return;
3494 3768
3495 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3770
3497 1 3771 1
3498} 3772}
3499 3773
3500our $uuid_lock; 3774our $uuid_lock;
… …
3509 my $uuid = "$LOCALDIR/uuid"; 3783 my $uuid = "$LOCALDIR/uuid";
3510 3784
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3785 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3786 or return;
3513 3787
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3789
3790 unless ($value) {
3791 info "cowardly refusing to write zero uuid value!\n";
3792 return;
3793 }
3794
3795 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3796 $uuid_skip = 0;
3516 3797
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3798 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3799 and return;
3519 3800
… …
3525 or return; 3806 or return;
3526 3807
3527 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3528 and return; 3809 and return;
3529 3810
3530 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3531 3812
3532 1 3813 1
3533 3814
3534} 3815}
3535 3816
… …
3541} 3822}
3542 3823
3543sub emergency_save() { 3824sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3545 3826
3546 warn "enter emergency perl save\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3547 3833
3548 cf::sync_job { 3834 cf::sync_job {
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3549 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3843 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3845 $pl->save;
3558 } 3846 }
3559 warn "end emergency player save\n"; 3847 info "emergency_perl_save: end player save\n";
3560 3848
3561 warn "begin emergency map save\n"; 3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3851 info "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3854 $map->valid or next;
3565 $map->save; 3855 $map->save;
3566 } 3856 }
3567 warn "end emergency map save\n"; 3857 info "emergency_perl_save: end map save\n";
3568 3858
3569 warn "begin emergency database checkpoint\n"; 3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3861 info "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3572 3864
3573 warn "begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3866 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3576 }; 3887 };
3577 3888
3578 warn "leave emergency perl save\n"; 3889 info "emergency_perl_save: leave\n";
3579} 3890}
3580 3891
3581sub post_cleanup { 3892sub post_cleanup {
3582 my ($make_core) = @_; 3893 my ($make_core) = @_;
3583 3894
3895 IO::AIO::flush;
3896
3584 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3898 if $make_core;
3899
3900 my $fh = pidfile;
3901 unlink $PIDFILE if <$fh> == $$;
3902}
3903
3904# a safer delete_package, copied from Symbol
3905sub clear_package($) {
3906 my $pkg = shift;
3907
3908 # expand to full symbol table name if needed
3909 unless ($pkg =~ /^main::.*::$/) {
3910 $pkg = "main$pkg" if $pkg =~ /^::/;
3911 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3912 $pkg .= '::' unless $pkg =~ /::$/;
3913 }
3914
3915 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3916 my $stem_symtab = *{$stem}{HASH};
3917
3918 defined $stem_symtab and exists $stem_symtab->{$leaf}
3919 or return;
3920
3921 # clear all symbols
3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3923 for my $name (keys %$leaf_symtab) {
3924 _gv_clear *{"$pkg$name"};
3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3926 }
3586} 3927}
3587 3928
3588sub do_reload_perl() { 3929sub do_reload_perl() {
3589 # can/must only be called in main 3930 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3591 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3592 return; 3933 return;
3593 } 3934 }
3594 3935
3595 warn "reloading..."; 3936 return if $RELOAD++;
3596 3937
3597 warn "entering sync_job"; 3938 my $t1 = AE::time;
3598 3939
3940 while ($RELOAD) {
3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3943
3944 trace "perl_reload: entering sync_job";
3945
3599 cf::sync_job { 3946 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3947 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 3948
3604 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV;
3606
3607 # if anything goes wrong in here, we should simply crash as we already saved
3608
3609 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs;
3615 warn "iterate...";
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 3951 %EXT_CORO = ();
3623 3952
3624 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3625 %COMMAND = (); 3954 %COMMAND = ();
3626 3955
3627 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3628 %EXTCMD = (); 3957 %EXTCMD = ();
3629 %EXTICMD = (); 3958 %EXTICMD = ();
3630 3959
3631 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3634 3963
3635 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3636 eval { 3965 eval {
3637 $cb->($pkg); 3966 $cb->($pkg);
3638 1 3967 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3969 }
3970
3971 trace "... clearing $pkg";
3972 clear_package $pkg;
3640 } 3973 }
3641 3974
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3978
3650 warn "... unloading $k"; 3979 trace "... unloading $k";
3651 delete $INC{$k}; 3980 delete $INC{$k};
3652 3981
3653 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3655 3984
3656 if (my $cb = $k->can ("unload_module")) { 3985 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 3986 $cb->();
3987 }
3988
3989 clear_package $k;
3658 } 3990 }
3659 3991
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3993 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3995
3667 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3999
3671 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3672 # and global variables created in xs 4001 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3674 4003
3675 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3676 4005
3677 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3678 require cf; 4007 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
3680 4009
3681 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3682 cf::reload_config; 4011 cf::reload_config;
3683 4012
3684 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3685 cf::load_extensions; 4014 cf::load_extensions;
3686 4015
4016 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3690 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
4023 }
3693 4024
3694 warn "leaving sync_job"; 4025 cf::_post_init 1;
3695 4026
4027 trace "perl_reload: leaving sync_job";
4028
3696 1 4029 1
3697 } or do { 4030 } or do {
3698 warn $@; 4031 error $@;
3699 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
4033 };
4034
4035 --$RELOAD;
3700 }; 4036 }
3701 4037
3702 warn "reloaded"; 4038 $t1 = AE::time - $t1;
4039 info "perl_reload: completed in ${t1}s\n";
3703}; 4040};
3704 4041
3705our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3706 4043
3707sub reload_perl() { 4044sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4045 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3710 4047
4048 $RELOAD_WATCHER ||= cf::async {
4049 Coro::AIO::aio_wait cache_extensions;
4050
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4052 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
4054 };
3714 }; 4055 };
3715} 4056}
3716 4057
3717register_command "reload" => sub { 4058register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4059 my ($who, $arg) = @_;
… …
3724 reload_perl; 4065 reload_perl;
3725 }; 4066 };
3726 } 4067 }
3727}; 4068};
3728 4069
3729unshift @INC, $LIBDIR; 4070#############################################################################
3730 4071
3731my $bug_warning = 0; 4072my $bug_warning = 0;
3732 4073
3733our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3735 4076
3736sub wait_for_tick { 4077sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4079
3739 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 4082 $signal->wait;
3742} 4083}
3743 4084
3744sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4087
3747 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4090 $signal->wait;
3750} 4091}
… …
3756 return; 4097 return;
3757 } 4098 }
3758 4099
3759 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3760 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4106 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4108 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3767 }; 4110 };
3768 } 4111 }
3769 4112
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4114 $sig->send;
… …
3779 4122
3780 if (0) { 4123 if (0) {
3781 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3785 } 4128 }
3786 } 4129 }
3787} 4130}
3788 4131
3789{ 4132{
3790 # configure BDB 4133 # configure BDB
3791 4134
3792 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3795 4138
3796 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4146
3803 cf::sync_job { 4147 cf::sync_job {
3804 eval { 4148 eval {
… …
3833 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3835 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3836} 4180}
3837 4181
3838my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3839 4184
3840sub _log_backtrace { 4185sub _log_backtrace {
3841 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3842 4187
3843 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3844 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3845 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3847 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3848 async { 4198 async {
3849 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3850 4200
3851 my @bt = fork_call { 4201 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 4213 }
3864 4214
3865 @funcs 4215 @funcs
3866 }; 4216 };
3867 4217
3868 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4221 --$_log_backtrace;
3871 }; 4222 };
3872 } else { 4223 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3875 } 4226 }
3876} 4227}
3877 4228
3878# load additional modules 4229# load additional modules
3879use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3880 4232
3881END { cf::emergency_save } 4233END { cf::emergency_save }
3882 4234
38831 42351
3884 4236

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines