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

Diff Legend

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