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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines