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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
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;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
83 125
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 129our $DB_ENV;
89 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
90our %CFG; 133our %CFG;
91 134
92our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 136our $RUNTIME;
137our $NOW;
94 138
95our (%PLAYER, %PLAYER_LOADING); # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 140our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
98 142
99# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 145
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
104our $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 :)
105 155
106binmode STDOUT; 156binmode STDOUT;
107binmode STDERR; 157binmode STDERR;
108 158
109# read virtual server time, if available 159# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
114} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
115 167
116mkdir $_ 168mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 170
119our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
120 172
121sub 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::"} };
122 189
123############################################################################# 190#############################################################################
124 191
125=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
126 193
162 229
163The raw value load value from the last tick. 230The raw value load value from the last tick.
164 231
165=item %cf::CFG 232=item %cf::CFG
166 233
167Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 235from wherever your confdir points to.
169 236
170=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
171 238
172These 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
173returns 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
174per 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.
175 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
176=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
177 249
178This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
179C<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
180that call. 252that call.
181 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
182=back 260=back
183 261
184=cut 262=cut
185 263
186BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
187 *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 {
188 my $msg = join "", @_; 271 my $msg = join "", @_;
189 272
190 $msg .= "\n" 273 $msg .= "\n"
191 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
192 275
193 $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;
194 277
195 LOG llevError, $msg; 278 LOG llevWarn, $msg;
196 }; 279};
197} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
198 294
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 305for my $pkg (qw(
210 cf::global cf::attachable 306 cf::global cf::attachable
211 cf::object cf::object::player 307 cf::object cf::object::player
212 cf::client cf::player 308 cf::client cf::player
213 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
214 cf::map cf::party cf::region 311 cf::party cf::region
215)) { 312)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 314}
219 315
220$Event::DIED = sub { 316$EV::DIED = sub {
221 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
222}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
223 324
224############################################################################# 325#############################################################################
225 326
226=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
227 328
248 $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;
249 $d 350 $d
250 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
251} 352}
252 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
253=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
254 369
255Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
256 371
257=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
258 373
259Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
260 375
261=cut 376=cut
262 377
263our $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
264 379
265sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
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}
267 444
268=item cf::lock_wait $string 445=item cf::lock_wait $string
269 446
270Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
271 448
272=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
273 450
274Wait 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
275a 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,
276for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
277returned. 454returned.
278 455
279Locks 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
280deadlocked coro. 457deadlocked coro.
286 463
287Return 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.
288 465
289=cut 466=cut
290 467
291our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 469
294sub lock_wait($) { 470sub lock_wait($) {
295 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 472}
308 473
309sub lock_acquire($) { 474sub lock_acquire($) {
310 my ($key) = @_; 475 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 476}
324 477
325sub lock_active($) { 478sub lock_active($) {
326 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 480}
330 481
331sub freeze_mainloop { 482sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
333 484
334 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 486}
336 }; 487
337 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
338 $guard 489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
339} 501}
340 502
341=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
342 504
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
344This 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
345of 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.
346 512
347The 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
348used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
349 515
350Useful for short background jobs. 516Useful for short background jobs.
351 517
352=cut 518=cut
353 519
354our @SLOT_QUEUE; 520our @SLOT_QUEUE;
355our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
356 523
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
360 527
361 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
362 530
363 while () { 531 while () {
364 next_job: 532 next_job:
533
365 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 535
367 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 540 $job->[2]->send;
371 Coro::cede; 541 Coro::cede;
372 goto next_job; 542 goto next_job;
373 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 545 }
375 } 546 }
376 547
377 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
378 # 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
379 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 551 $signal->wait;
381 } else { 552 } else {
553 $busy = 0;
382 Coro::schedule; 554 Coro::schedule;
383 } 555 }
384 } 556 }
385}; 557};
386 558
387sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
388 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
389 563
390 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
391 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
392 567
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
406 581
407BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
408 583
409=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
410 585
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 589acceptable.
415 590
416If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
421=cut 596=cut
422 597
423sub sync_job(&) { 598sub sync_job(&) {
424 my ($job) = @_; 599 my ($job) = @_;
425 600
426 if ($Coro::current == $Coro::main) { 601 if (in_main) {
427 my $time = Event::time; 602 my $time = AE::time;
428 603
429 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
431 606
432 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
433 608
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
437 610
438 my $busy = 1; 611 my $busy = 1;
439 my @res; 612 my @res;
440 613
441 (async { 614 (async {
442 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 616 @res = eval { $job->() };
444 warn $@ if $@; 617 error $@ if $@;
445 undef $busy; 618 undef $busy;
446 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
447 620
448 while ($busy) { 621 while ($busy) {
449 if (Coro::nready) { 622 if (Coro::nready) {
450 Coro::cede_notself; 623 Coro::cede_notself;
451 } else { 624 } else {
452 Event::one_event; 625 EV::loop EV::LOOP_ONESHOT;
453 } 626 }
454 } 627 }
455 628
456 $time = Event::time - $time; 629 my $time = AE::time - $time;
457 630
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
462 632
463 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
464 } else { 634 } else {
465 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
466 636
486 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
487 657
488 $coro 658 $coro
489} 659}
490 660
491=item fork_call { }, $args 661=item fork_call { }, @args
492 662
493Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
497 667
498=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
499 673
500sub fork_call(&@) { 674sub fork_call(&@) {
501 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
502 676
503 # 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,
504 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
506 680
507 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
508 reset_signals; 682 cf::post_fork;
509 &$cb 683 &$cb
510 }, @args; 684 } @args;
511 685
512 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 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
513} 725}
514 726
515=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
516 728
517Returns a single value from the environment database. 729Returns a single value from the environment database.
527within each server. 739within each server.
528 740
529=cut 741=cut
530 742
531sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
532 my ($name) = @_; 747 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
534 749
535 eval { 750 eval {
536 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
546} 761}
547 762
548our $DB; 763our $DB;
549 764
550sub db_init { 765sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
553 };
554} 767}
555 768
556sub db_get($$) { 769sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
558 771
559 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
560 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
561 776
562 $! ? () 777 $! ? ()
563 : $data 778 : $data
564 }
565} 779}
566 780
567sub db_put($$$) { 781sub db_put($$$) {
568 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
597 811
598 my @data; 812 my @data;
599 my $md5; 813 my $md5;
600 814
601 for (0 .. $#$src) { 815 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
603 or Carp::croak "$src->[$_]: $!";
604 } 817 }
605 818
606 # if processing is expensive, check 819 # if processing is expensive, check
607 # checksum first 820 # checksum first
608 if (1) { 821 if (1) {
625 838
626 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 840 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
629 842
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 844
632 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
635 848
645 858
646=cut 859=cut
647 860
648sub datalog($@) { 861sub datalog($@) {
649 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 864}
652 865
653=back 866=back
654 867
655=cut 868=cut
656 869
657############################################################################# 870#############################################################################
658 871
659=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
660 873
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
664 877
665In 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>
666C<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
667Crossfire TRT). 880Deliantra).
668 881
669=over 4 882=over 4
670 883
671=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
672 885
716=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
717 930
718Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
720 933
721Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 936
724These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
725 938
726=over 4 939=over 4
850 1063
851 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 1066
854 } elsif (ref $type) { 1067 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
856 1069
857 } else { 1070 } else {
858 shift @arg; 1071 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
860 } 1073 }
861 } 1074 }
862} 1075}
863 1076
864sub _object_attach { 1077sub _object_attach {
874 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
875 } 1088 }
876 1089
877 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
878 } else { 1091 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1093 }
881 1094
882 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
883} 1096}
884 1097
943 1156
944 for (@$callbacks) { 1157 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
946 1159
947 if ($@) { 1160 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1162 override;
951 } 1163 }
952 1164
953 return 1 if $override; 1165 return 1 if $override;
954 } 1166 }
955 1167
956 0 1168 0
957} 1169}
958 1170
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1172
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1174
963Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
964 1176
1017 1229
1018sub reattach { 1230sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1232 my ($obj) = @_;
1021 1233
1234 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1236
1024 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1025 1238
1026 @$registry = (); 1239 @$registry = ();
1027 1240
1032 for (@$attach) { 1245 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1035 } 1248 }
1036 } else { 1249 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1251 }
1039 } 1252 }
1040} 1253}
1041 1254
1042cf::attachable->attach ( 1255cf::attachable->attach (
1043 prio => -1000000, 1256 prio => -1000000,
1044 on_instantiate => sub { 1257 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1046 1259
1047 $data = from_json $data; 1260 $data = decode_json $data;
1048 1261
1049 for (@$data) { 1262 for (@$data) {
1050 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1051 1264
1052 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1070 1283
1071 sync_job { 1284 sync_job {
1072 if (length $$rdata) { 1285 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1076 1290
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 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 }
1081 close $fh; 1298 aio_close $fh;
1082 1299
1083 if (@$objs) { 1300 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1088 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 }
1089 close $fh; 1309 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1311 }
1092 } else { 1312 } else {
1093 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1094 } 1314 }
1095 1315
1096 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1320 } else {
1098 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1099 } 1322 }
1100 } else { 1323 } else {
1101 aio_unlink $filename; 1324 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1103 } 1326 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1351 $av = $st->{objs};
1129 } 1352 }
1130 1353
1131 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1134 1358
1135 ($data, $av) 1359 ($data, $av)
1136} 1360}
1137 1361
1138=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1195 1419
1196 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1197} 1421}
1198 1422
1423use File::Glob ();
1424
1199cf::player->attach ( 1425cf::player->attach (
1200 on_command => sub { 1426 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1202 1428
1203 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1204 or return; 1430 or return;
1205 1431
1228 1454
1229 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1456 if $reply;
1231 1457
1232 } else { 1458 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1460 }
1235 1461
1236 cf::override; 1462 cf::override;
1237 }, 1463 },
1238); 1464);
1239 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
1240sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1241 cf::sync_job { 1482 cf::sync_job {
1242 my %todo; 1483 my %todo;
1243 1484
1244 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1486 next unless -r $path;
1263 1504
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1507
1267 $ext{source} = 1508 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1270 . $source 1511 . $source
1271 . "\n};\n1"; 1512 . "\n};\n1";
1272 1513
1273 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1274 } 1515 }
1275 1516
1517 my $pass = 0;
1276 my %done; 1518 my %done;
1277 while (%todo) { 1519 while (%todo) {
1278 my $progress; 1520 my $progress;
1279 1521
1522 ++$pass;
1523
1524 ext:
1280 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1527 next ext
1283 unless exists $done{$_}; 1528 unless exists $done{$_};
1284 } 1529 }
1285 1530
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1532
1288 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1293 warn $msg; 1540
1294 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1542 delete $todo{$k};
1296 } 1543 } else {
1297 1544 $done{$k} = delete $todo{$k};
1298 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1299 } 1550 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1551 }
1305 1552
1306 skip: 1553 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1309 } 1563 }
1310 }; 1564 };
1311} 1565}
1312 1566
1313############################################################################# 1567#############################################################################
1314 1568
1315=back 1569=back
1316 1570
1317=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1318 1572
1319Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1320 1574
1321=cut 1575=cut
1322 1576
1323package cf::player; 1577package cf::player;
1324 1578
1367 1621
1368sub exists($) { 1622sub exists($) {
1369 my ($login) = @_; 1623 my ($login) = @_;
1370 1624
1371 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1373} 1627}
1374 1628
1375sub find($) { 1629sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1631 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1644 or return;
1391 1645
1392 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1393 or return; 1647 or return;
1648
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1397 } 1652 }
1398 } 1653 }
1399} 1654}
1400 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1401sub save($) { 1669sub save($) {
1402 my ($pl) = @_; 1670 my ($pl) = @_;
1403 1671
1404 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1405 1673
1408 1676
1409 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1410 1678
1411 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1686
1414 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1688 cf::cede_to_tick;
1416} 1689}
1417 1690
1449 my ($pl) = @_; 1722 my ($pl) = @_;
1450 1723
1451 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1452 1725
1453 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1728
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1457 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1459 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1460 1737
1461 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1501 1778
1502 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1503 my $path = path $login; 1780 my $path = path $login;
1504 1781
1505 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1788 }
1511 1789
1515 1793
1516 \@logins 1794 \@logins
1517} 1795}
1518 1796
1519=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1520 1800
1521Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1522player. May block. 1802player. May block.
1523 1803
1524=cut 1804=cut
1542 } 1822 }
1543 1823
1544 \@paths 1824 \@paths
1545} 1825}
1546 1826
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1828
1549Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1830
1598=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1599 1832
1600Sends an ext reply to the player. 1833Sends an ext reply to the player.
1601 1834
1633 1866
1634=cut 1867=cut
1635 1868
1636sub find_by_path($) { 1869sub find_by_path($) {
1637 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1638 1873
1639 my ($match, $specificity); 1874 my ($match, $specificity);
1640 1875
1641 for my $region (list) { 1876 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1668our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1670 1905
1671sub generate_random_map { 1906sub generate_random_map {
1672 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1673 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1674 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1682 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1683 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1684 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1685 (cf::region::find $rmp->{region}), $rmp->{custom}
1686 )
1687} 1912}
1688 1913
1689=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1690 1915
1691Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1696 1921
1697sub register { 1922sub register {
1698 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1699 my $pkg = caller; 1924 my $pkg = caller;
1700 1925
1701 no strict;
1702 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1703 1927
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1929}
1706 1930
1707# also paths starting with '/' 1931# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1933
1710sub thawer_merge { 1934sub thawer_merge {
1711 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1712 1936
1713 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1718} 1942}
1719 1943
1720sub normalise { 1944sub normalise {
1721 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1722 1946
1723 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1724 1948
1725 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1726 1950
1727 # map plan: 1951 # map plan:
1728 # 1952 #
1743 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1744 $path = "$base/$path"; 1968 $path = "$base/$path";
1745 } 1969 }
1746 1970
1747 for ($path) { 1971 for ($path) {
1748 redo if s{//}{/};
1749 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1750 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1751 } 1974 }
1752 1975
1753 $path 1976 $path
1767 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1768 return $self; 1991 return $self;
1769 } 1992 }
1770 } 1993 }
1771 1994
1772 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1773 () 1996 ()
1774} 1997}
1775 1998
1999# may re-bless or do other evil things
1776sub init { 2000sub init {
1777 my ($self) = @_; 2001 my ($self) = @_;
1778 2002
1779 $self 2003 $self
1780} 2004}
1799 2023
1800# the temporary/swap location 2024# the temporary/swap location
1801sub save_path { 2025sub save_path {
1802 my ($self) = @_; 2026 my ($self) = @_;
1803 2027
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1806} 2030}
1807 2031
1808# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1809sub uniq_path { 2033sub uniq_path {
1810 my ($self) = @_; 2034 my ($self) = @_;
1811 2035
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 2038}
1824 2039
1825sub decay_objects { 2040sub decay_objects {
1826 my ($self) = @_; 2041 my ($self) = @_;
1827 2042
1854 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1855 2070
1856 1 2071 1
1857} 2072}
1858 2073
2074# used to laod the header of an original map
1859sub load_header_orig { 2075sub load_header_orig {
1860 my ($self) = @_; 2076 my ($self) = @_;
1861 2077
1862 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1863} 2079}
1864 2080
2081# used to laod the header of an instantiated map
1865sub load_header_temp { 2082sub load_header_temp {
1866 my ($self) = @_; 2083 my ($self) = @_;
1867 2084
1868 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1869} 2086}
1870 2087
2088# called after loading the header from an instantiated map
1871sub prepare_temp { 2089sub prepare_temp {
1872 my ($self) = @_; 2090 my ($self) = @_;
1873 2091
1874 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1875 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1876 # safety 2094 # safety
1877 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1878 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1879} 2097}
1880 2098
2099# called after loading the header from an original map
1881sub prepare_orig { 2100sub prepare_orig {
1882 my ($self) = @_; 2101 my ($self) = @_;
1883 2102
1884 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1885 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1909 2128
1910sub find; 2129sub find;
1911sub find { 2130sub find {
1912 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1913 2132
2133 cf::cede_to_tick;
2134
1914 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1915 2136
1916 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2139
1919 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1924 or return; 2142 or return;
1925 2143
1926 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1927 2145
1929 or return; 2147 or return;
1930 2148
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
1934 undef $guard1; 2153 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2154 $map->reset;
1937 return find $path; 2155 return find $path;
1938 } 2156 }
1939 2157
1940 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1941 } 2159 }
1942} 2160}
1943 2161
1944sub pre_load { } 2162sub pre_load { }
1945sub post_load { } 2163#sub post_load { } # XS
1946 2164
1947sub load { 2165sub load {
1948 my ($self) = @_; 2166 my ($self) = @_;
1949 2167
1950 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1962 $self->alloc; 2180 $self->alloc;
1963 2181
1964 $self->pre_load; 2182 $self->pre_load;
1965 cf::cede_to_tick; 2183 cf::cede_to_tick;
1966 2184
2185 if (exists $self->{load_path}) {
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2187 $f->skip_block;
1969 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
1970 or return; 2189 or return;
1971 2190
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2191 $self->post_load_original
1973 if delete $self->{load_original}; 2192 if delete $self->{load_original};
1974 2193
1975 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2195 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
1979 $self->clear_unique_items; 2198 $self->clear_unique_items;
1980 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
1982 } 2202 }
1983 } 2203 }
1984 }
1985 2204
1986 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
1987 2210
1988 cf::cede_to_tick; 2211 cf::cede_to_tick;
1989 # now do the right thing for maps 2212 # now do the right thing for maps
1990 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
1991 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
1995 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2219 $self->decay_objects;
1997 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
1998 $self->update_buttons; 2221 $self->update_buttons;
1999 cf::cede_to_tick; 2222 cf::cede_to_tick;
2000 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2001 cf::cede_to_tick;
2002 $self->activate;
2003 } 2224 }
2004 2225
2005 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2007 2228
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2229 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2230 }
2010 2231
2011 $self->post_load; 2232 $self->post_load;
2012}
2013 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
2014sub customise_for { 2240sub customise_for {
2015 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
2016 2242
2017 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2244 if $self->per_player;
2034 or next; 2260 or next;
2035 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2036 or next; 2262 or next;
2037 $neigh->load; 2263 $neigh->load;
2038 2264
2265 # now find the diagonal neighbours
2039 push @neigh, 2266 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 } 2269 }
2043 2270
2050} 2277}
2051 2278
2052sub find_sync { 2279sub find_sync {
2053 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2054 2281
2055 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2056} 2286}
2057 2287
2058sub do_load_sync { 2288sub do_load_sync {
2059 my ($map) = @_; 2289 my ($map) = @_;
2060 2290
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2063 2293
2064 cf::sync_job { $map->load }; 2294 $map->load;
2065} 2295}
2066 2296
2067our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2068our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2069 2299
2070sub find_async { 2300sub find_async {
2071 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2072 2302
2073 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2074 2304
2075 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2307 }
2078 2308
2079 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2080 2310
2081 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2095 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2096 2326
2097 () 2327 ()
2098} 2328}
2099 2329
2330# common code, used by both ->save and ->swapout
2100sub save { 2331sub _save {
2101 my ($self) = @_; 2332 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2333
2105 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2106 2335
2107 return unless $self->dirty; 2336 return unless $self->dirty;
2108 2337
2117 2346
2118 cf::async { 2347 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2348 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
2121 }; 2350 };
2351
2352 cf::get_slot 0.02;
2122 2353
2123 if ($uniq) { 2354 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2357 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2128 } 2359 }
2129} 2360}
2130 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2131sub swap_out { 2370sub swap_out {
2132 my ($self) = @_; 2371 my ($self) = @_;
2133 2372
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2374
2375 return if $self->in_memory != cf::MAP_ACTIVE;
2376 return if $self->{deny_save};
2139 return if $self->players; 2377 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2141 return if $self->{deny_save};
2142 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2143 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2144 2429
2145 $self->deactivate; 2430 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2432 $self->clear;
2148}
2149
2150sub reset_at {
2151 my ($self) = @_;
2152
2153 # TODO: safety, remove and allow resettable per-player maps
2154 return 1e99 if $self->{deny_reset};
2155
2156 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2157 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2158
2159 $time + $to
2160}
2161
2162sub should_reset {
2163 my ($self) = @_;
2164
2165 $self->reset_at <= $cf::RUNTIME
2166}
2167
2168sub reset {
2169 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172
2173 return if $self->players;
2174
2175 warn "resetting map ", $self->path;
2176
2177 $self->in_memory (cf::MAP_SWAPPED);
2178
2179 # need to save uniques path
2180 unless ($self->{deny_save}) {
2181 my $uniq = $self->uniq_path; utf8::encode $uniq;
2182
2183 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2184 if $uniq;
2185 }
2186
2187 delete $cf::MAP{$self->path};
2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2191 $self->clear;
2192 2433
2193 $self->unlink_save; 2434 $self->unlink_save;
2194 $self->destroy; 2435 $self->destroy;
2195} 2436}
2196 2437
2204 2445
2205 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2206 2447
2207 $self->unlink_save; 2448 $self->unlink_save;
2208 2449
2209 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2455
2263 2504
2264sub unique_maps() { 2505sub unique_maps() {
2265 [ 2506 [
2266 map { 2507 map {
2267 utf8::decode $_; 2508 utf8::decode $_;
2268 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2269 ? normalise $_ 2512 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2514 ]
2273} 2515}
2274 2516
2275package cf; 2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2276 2548
2277=back 2549=back
2278 2550
2279=head3 cf::object 2551=head3 cf::object
2280 2552
2284 2556
2285=over 4 2557=over 4
2286 2558
2287=item $ob->inv_recursive 2559=item $ob->inv_recursive
2288 2560
2289Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2290 2563
2291=cut 2564=cut
2292 2565
2293sub inv_recursive_; 2566sub inv_recursive_;
2294sub inv_recursive_ { 2567sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2300} 2573}
2301 2574
2302=item $ref = $ob->ref 2575=item $ref = $ob->ref
2303 2576
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2577Creates and returns a persistent reference to an object that can be stored as a string.
2305 2578
2306=item $ob = cf::object::deref ($refstring) 2579=item $ob = cf::object::deref ($refstring)
2307 2580
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2582even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2615dialogue with the given NPC character.
2343 2616
2344=cut 2617=cut
2345 2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2632
2346# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2634# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2637 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2650
2364 } else { 2651 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2654 }
2368 } 2655 }
2369} 2656}
2370 2657
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2683
2397=item $player_object->enter_link 2684=item $player_object->enter_link
2398 2685
2399Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2400 2687
2401The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2403 2692
2404Will never block. 2693Will never block.
2405 2694
2406=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2407 2696
2427sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2428 my ($self) = @_; 2717 my ($self) = @_;
2429 2718
2430 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2431 2720
2721 ++$self->{_link_recursion};
2722
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2724
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2436 2727
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2729}
2439 2730
2440sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2442 2733
2459 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2461 2752
2462 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2465 2756
2466 $map->load; 2757 $map->load;
2467 $map->load_neighbours; 2758 $map->load_neighbours;
2468 2759
2469 return unless $self->contr->active; 2760 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2761
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2474} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2475 2769
2770}
2771
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2477 2773
2478Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2778be called at the end of this process.
2483 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2484=cut 2783=cut
2485 2784
2486our $GOTOGEN; 2785our $GOTOGEN;
2487 2786
2488sub cf::object::player::goto { 2787sub cf::object::player::goto {
2489 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2490 2795
2491 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2798
2494 $self->enter_link; 2799 $self->enter_link;
2514 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2515 } 2820 }
2516 } 2821 }
2517 2822
2518 my $map = eval { 2823 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2520 2825
2521 if ($map) { 2826 if ($map) {
2522 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2829 } else {
2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2526 } 2831 }
2527 2832
2528 $map 2833 $map
2536 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2539 } 2844 }
2540 2845
2541 $done->() if $done; 2846 $done->($self) if $done;
2542 })->prio (1); 2847 })->prio (1);
2543} 2848}
2544 2849
2545=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2546 2851
2566} 2871}
2567 2872
2568sub prepare_random_map { 2873sub prepare_random_map {
2569 my ($exit) = @_; 2874 my ($exit) = @_;
2570 2875
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2878 # that depends on the exit object
2576 2879
2577 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2882 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2584 } 2889 }
2585 2890
2586 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2587 2892
2588 my $data = cf::to_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2591 2896
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2899 undef $fh;
2595 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2596 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2599 } 2908 }
2600} 2909}
2601 2910
2602sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2604 2913
2605 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2606 2915
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2916 $self->enter_link;
2619 2917
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2918 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2919 $Coro::current->{desc} = "enter_exit";
2626 2920
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2948
2629 $self->goto ($slaying, $hp, $sp); 2949 $self->goto ($map, $x, $y);
2630 2950
2951 # if exit is damned, update players death & WoR home-position
2952 $self->contr->savebed ($map, $x, $y)
2953 if $exit->flag (cf::FLAG_DAMNED);
2954
2631 1; 2955 1
2632 }) { 2956 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2961
2638 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2639 $self->leave_link; 2963 $self->leave_link;
2640 } 2964 }
2641 })->prio (1); 2965 })->prio (1);
2642} 2966}
2643 2967
2655sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2657 2981
2658 utf8::encode $text; 2982 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2984}
2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
2660} 3009}
2661 3010
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 3012
2664Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2666the message, with C<log> being the default. If C<$color> is negative, suppress 3015the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 3016the message unless the client supports the msg packet.
2668 3017
2669=cut 3018=cut
2670 3019
3020# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
2672 "c/identify" => { 3028 "c/identify" => {
2673 id => "infobox", 3029 id => "infobox",
2674 title => "Identify", 3030 title => "Identify",
2675 reply => undef, 3031 reply => undef,
2676 tooltip => "Items recently identified", 3032 tooltip => "Items recently identified",
2678 "c/examine" => { 3034 "c/examine" => {
2679 id => "infobox", 3035 id => "infobox",
2680 title => "Examine", 3036 title => "Examine",
2681 reply => undef, 3037 reply => undef,
2682 tooltip => "Signs and other items you examined", 3038 tooltip => "Signs and other items you examined",
3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
2683 }, 3045 },
2684 "c/book" => { 3046 "c/book" => {
2685 id => "infobox", 3047 id => "infobox",
2686 title => "Book", 3048 title => "Book",
2687 reply => undef, 3049 reply => undef,
2691 id => "infobox", 3053 id => "infobox",
2692 title => "Look", 3054 title => "Look",
2693 reply => undef, 3055 reply => undef,
2694 tooltip => "What you saw there", 3056 tooltip => "What you saw there",
2695 }, 3057 },
3058 "c/who" => {
3059 id => "infobox",
3060 title => "Players",
3061 reply => undef,
3062 tooltip => "Shows players who are currently online",
3063 },
3064 "c/body" => {
3065 id => "infobox",
3066 title => "Body Parts",
3067 reply => undef,
3068 tooltip => "Shows which body parts you posess and are available",
3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
3076 "c/skills" => {
3077 id => "infobox",
3078 title => "Skills",
3079 reply => undef,
3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
3105 },
3106 "c/uptime" => {
3107 id => "infobox",
3108 title => "Uptime",
3109 reply => undef,
3110 tooltip => "How long the server has been running since last restart",
3111 },
3112 "c/mapinfo" => {
3113 id => "infobox",
3114 title => "Map Info",
3115 reply => undef,
3116 tooltip => "Information related to the maps",
3117 },
3118 "c/party" => {
3119 id => "party",
3120 title => "Party",
3121 reply => "gsay ",
3122 tooltip => "Messages and chat related to your party",
3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
2696); 3132);
2697 3133
2698sub cf::client::send_msg { 3134sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2700 3136
2701 $msg = $self->pl->expand_cfpod ($msg); 3137 $msg = $self->pl->expand_cfpod ($msg)
3138 unless $color & cf::NDI_VERBATIM;
2702 3139
2703 $color &= cf::NDI_CLIENT_MASK; # just in case... 3140 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704 3141
2705 # check predefined channels, for the benefit of C 3142 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) { 3143 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel}; 3144 $channel = $CHANNEL{$channel};
2708 3145
2709 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id}; 3147 $channel = $channel->{id};
2713 3148
2714 } elsif (ref $channel) { 3149 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel) 3153 $self->ext_msg (channel_info => $channel);
2719 if $self->can_msg;
2720 } 3154 }
2721 3155
2722 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2723 } 3157 }
2724 3158
2725 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2726 3160
2727 if ($self->can_msg) {
2728 # default colour, mask it out 3161 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF; 3163 if $color & cf::NDI_DEF;
2731 3164
2732 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3165 my $pkt = "msg "
3166 . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2734 } else { 3168 );
2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745 3169
2746 $color &= cf::NDI_COLOR_MASK; 3170 $self->send_big_packet ($pkt);
2747
2748 utf8::encode $msg;
2749
2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2753 } else {
2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2755 $self->send_packet ("drawinfo $color $msg")
2756 }
2757 }
2758 }
2759} 3171}
2760 3172
2761=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2762 3174
2763Sends an ext event to the client. 3175Sends an ext event to the client.
2766 3178
2767sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2768 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2769 3181
2770 if ($self->extcmd == 2) { 3182 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2773 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 } 3187 }
2776} 3188}
2777 3189
2778=item $client->ext_reply ($msgid, @msg) 3190=item $client->ext_reply ($msgid, @msg)
2779 3191
2783 3195
2784sub cf::client::ext_reply($$@) { 3196sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_; 3197 my ($self, $id, @msg) = @_;
2786 3198
2787 if ($self->extcmd == 2) { 3199 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) { 3201 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove 3202 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id; 3203 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 } 3205 }
2794} 3206}
2795 3207
2796=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2797 3209
2868 3280
2869 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
2870 if $reply; 3282 if $reply;
2871 3283
2872 } else { 3284 } else {
2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2874 } 3286 }
2875 3287
2876 cf::override; 3288 cf::override;
2877 }, 3289 },
2878); 3290);
2898 3310
2899 $coro 3311 $coro
2900} 3312}
2901 3313
2902cf::client->attach ( 3314cf::client->attach (
2903 on_destroy => sub { 3315 on_client_destroy => sub {
2904 my ($ns) = @_; 3316 my ($ns) = @_;
2905 3317
2906 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2907 }, 3319 },
2908); 3320);
2924our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
2925 3337
2926$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
2927 3339
2928$safe->permit_only (Opcode::opset qw( 3340$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math 3341 :base_core :base_mem :base_orig :base_math :base_loop
2930 grepstart grepwhile mapstart mapwhile 3342 grepstart grepwhile mapstart mapwhile
2931 sort time 3343 sort time
2932)); 3344));
2933 3345
2934# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
2937 3349
2938The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
2939 3351
2940 cf::object 3352 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy 3353 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr 3354 insert remove name archname title slaying race decrease split
3355 value
2943 3356
2944 cf::object::player 3357 cf::object::player
2945 player 3358 player
2946 3359
2947 cf::player 3360 cf::player
2952 3365
2953=cut 3366=cut
2954 3367
2955for ( 3368for (
2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race 3370 insert remove inv nrof name archname title slaying race
2958 decrease_ob_nr destroy)], 3371 decrease split destroy change_exp value msg lore send_msg)],
2959 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
2960 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
2961 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
2962) { 3375) {
2963 no strict 'refs';
2964 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
2965 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2966 for @funs; 3378 for @funs;
2967} 3379}
2968 3380
2983 3395
2984 my $qcode = $code; 3396 my $qcode = $code;
2985 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2986 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
2987 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
2988 local $_; 3403 local $_;
2989 local @safe::cf::_safe_eval_args = values %vars;
2990 3404
2991 my $eval = 3405 my $eval =
2992 "do {\n" 3406 "do {\n"
2993 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2994 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
2995 . $code 3409 . $code
2996 . "\n}" 3410 . "\n}"
2997 ; 3411 ;
2998 3412
3413 if ($CFG{safe_eval}) {
2999 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
3000 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3001 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
3002 3422
3003 if ($@) { 3423 if ($@) {
3004 warn "$@"; 3424 warn "$@",
3005 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3006 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3007 } 3427 }
3008 3428
3009 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3010} 3430}
3011 3431
3025=cut 3445=cut
3026 3446
3027sub register_script_function { 3447sub register_script_function {
3028 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
3029 3449
3030 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
3031 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
3032} 3452}
3033 3453
3034=back 3454=back
3035 3455
3036=cut 3456=cut
3045 # for this (global event?) 3465 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3047 3467
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049 3469
3050 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3051 3471
3052 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3053 0 < aio_load $path, $facedata
3054 or die "$path: $!";
3055
3056 $facedata = Coro::Storable::thaw $facedata;
3057 3473
3058 $facedata->{version} == 2 3474 $facedata->{version} == 2
3059 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060 3476
3061 # patch in the exptable 3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3062 $facedata->{resource}{"res/exp_table"} = { 3479 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC, 3480 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3065 }; 3483 };
3066 cf::cede_to_tick; 3484 cf::cede_to_tick;
3067 3485
3068 { 3486 {
3069 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
3070 3488
3071 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3491
3073 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3077 3497
3078 cf::cede_to_tick; 3498 cf::cede_to_tick;
3079 } 3499 }
3080 3500
3081 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3502 next unless $info->{smooth};
3503
3083 my $idx = cf::face::find $face 3504 my $idx = cf::face::find $face
3084 or next; 3505 or next;
3506
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3510 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3090 } 3512 }
3091 3513
3092 cf::cede_to_tick; 3514 cf::cede_to_tick;
3093 } 3515 }
3094 } 3516 }
3103 3525
3104 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
3105 } 3527 }
3106 3528
3107 { 3529 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
3111 3531
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
3533 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117 3535
3118 if ($info->{type} & 1) { 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3119 # prepend meta info 3537 cf::face::set_type $idx, $info->{type};
3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
3127 } else { 3538 } else {
3128 $data = $info->{data}; 3539 $RESOURCE{$name} = $info; # unused
3129 } 3540 }
3130 3541
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3542 cf::cede_to_tick;
3135 } 3543 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3544 }
3545
3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3547
3156 1 3548 1
3157} 3549}
3158 3550
3159register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3161 3553
3162 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v); 3555 $ns->fx_want ($k, $v);
3164 } 3556 }
3165}; 3557};
3558
3559sub load_resource_file($) {
3560 my $guard = lock_acquire "load_resource_file";
3561
3562 my $status = load_resource_file_ $_[0];
3563 get_slot 0.1, 100;
3564 cf::arch::commit_load;
3565
3566 $status
3567}
3166 3568
3167sub reload_regions { 3569sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework 3570 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?) 3571 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = (); 3572 %ext::player_env::MUSIC_FACE_CACHE = ();
3184} 3586}
3185 3587
3186sub reload_archetypes { 3588sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes" 3589 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n"; 3590 or die "unable to load archetypes\n";
3189 #d# NEED to laod twice to resolve forward references
3190 # this really needs to be done in an extra post-pass
3191 # (which needs to be synchronous, so solve it differently)
3192 load_resource_file "$DATADIR/archetypes"
3193 or die "unable to load archetypes\n";
3194} 3591}
3195 3592
3196sub reload_treasures { 3593sub reload_treasures {
3197 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3198 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3199} 3596}
3200 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3201sub reload_resources { 3618sub reload_resources {
3202 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3203 3620
3621 reload_exp_table;
3622 reload_materials;
3623 reload_facedata;
3624 reload_sound;
3625 reload_archetypes;
3204 reload_regions; 3626 reload_regions;
3205 reload_facedata;
3206 #reload_archetypes;#d#
3207 reload_archetypes;
3208 reload_treasures; 3627 reload_treasures;
3209 3628
3210 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3211}
3212
3213sub init {
3214 reload_resources;
3215} 3630}
3216 3631
3217sub reload_config { 3632sub reload_config {
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3633 trace "reloading config file...\n";
3219 or return;
3220 3634
3221 local $/; 3635 my $config = load_file "$CONFDIR/config";
3222 *CFG = YAML::Syck::Load <$fh>; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3223 3638
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3225 3640
3226 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3227 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 3643
3229 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
3233 }; 3648 };
3234 warn $@ if $@; 3649 warn $@ if $@;
3235 } 3650 }
3236} 3651}
3237 3652
3653sub pidfile() {
3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3655 or die "$PIDFILE: $!";
3656 flock $fh, &Fcntl::LOCK_EX
3657 or die "$PIDFILE: flock: $!";
3658 $fh
3659}
3660
3661# make sure only one server instance is running at any one time
3662sub atomic {
3663 my $fh = pidfile;
3664
3665 my $pid = <$fh>;
3666 kill 9, $pid if $pid > 0;
3667
3668 seek $fh, 0, 0;
3669 print $fh $$;
3670}
3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
3238sub main { 3681sub main {
3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3690
3239 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3694 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3696 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
3246 }; 3698 };
3247 3699
3700 evthread_start IO::AIO::poll_fileno;
3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3248 reload_config; 3712 reload_config;
3249 db_init; 3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
3250 load_extensions; 3723 load_extensions;
3251 3724
3252 $TICK_WATCHER->start; 3725 utime time, time, $RUNTIMEFILE;
3253 Event::loop; 3726
3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3730
3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
3254} 3743}
3255 3744
3256############################################################################# 3745#############################################################################
3257# initialisation and cleanup 3746# initialisation and cleanup
3258 3747
3259# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
3260BEGIN { 3749BEGIN {
3750 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
3269 },
3270 ); 3754 };
3271 } 3755 }
3272} 3756}
3273 3757
3274sub write_runtime { 3758sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime"; 3759 my $t0 = AE::time;
3276 3760
3277 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3279 3763
3280 IO::AIO::aio_utime $runtime, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281 3765
3282 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3283 3767
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3285 or return; 3769 or return;
3286 3770
3287 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3299 aio_utime $fh, undef, undef; 3783 aio_utime $fh, undef, undef;
3300 3784
3301 close $fh 3785 close $fh
3302 or return; 3786 or return;
3303 3787
3304 aio_rename "$runtime~", $runtime 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305 and return; 3789 and return;
3306 3790
3307 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3308 3792
3309 1 3793 1
3794}
3795
3796our $uuid_lock;
3797our $uuid_skip;
3798
3799sub write_uuid_sync($) {
3800 $uuid_skip ||= $_[0];
3801
3802 return if $uuid_lock;
3803 local $uuid_lock = 1;
3804
3805 my $uuid = "$LOCALDIR/uuid";
3806
3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3808 or return;
3809
3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3818 $uuid_skip = 0;
3819
3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3821 and return;
3822
3823 # always fsync - this file is important
3824 aio_fsync $fh
3825 and return;
3826
3827 close $fh
3828 or return;
3829
3830 aio_rename "$uuid~", $uuid
3831 and return;
3832
3833 trace "uuid file written ($value).\n";
3834
3835 1
3836
3837}
3838
3839sub write_uuid($$) {
3840 my ($skip, $sync) = @_;
3841
3842 $sync ? write_uuid_sync $skip
3843 : async { write_uuid_sync $skip };
3310} 3844}
3311 3845
3312sub emergency_save() { 3846sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3314 3848
3315 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3316 3855
3317 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3318 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3319 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3320 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3321 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3322 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3323 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3324 $pl->valid or next; 3865 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3326 $pl->save; 3867 $pl->save;
3327 } 3868 }
3328 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3329 3870
3330 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
3331 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3332 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3333 $map->valid or next; 3876 $map->valid or next;
3334 $map->save; 3877 $map->save;
3335 } 3878 }
3336 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3337 3880
3338 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3886
3887 info "emergency_perl_save: begin write uuid\n";
3888 write_uuid_sync 1;
3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3341 }; 3909 };
3342 3910
3343 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3344} 3912}
3345 3913
3346sub post_cleanup { 3914sub post_cleanup {
3347 my ($make_core) = @_; 3915 my ($make_core) = @_;
3348 3916
3917 IO::AIO::flush;
3918
3349 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3350 if $make_core; 3920 if $make_core;
3921
3922 my $fh = pidfile;
3923 unlink $PIDFILE if <$fh> == $$;
3924}
3925
3926# a safer delete_package, copied from Symbol
3927sub clear_package($) {
3928 my $pkg = shift;
3929
3930 # expand to full symbol table name if needed
3931 unless ($pkg =~ /^main::.*::$/) {
3932 $pkg = "main$pkg" if $pkg =~ /^::/;
3933 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3934 $pkg .= '::' unless $pkg =~ /::$/;
3935 }
3936
3937 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3938 my $stem_symtab = *{$stem}{HASH};
3939
3940 defined $stem_symtab and exists $stem_symtab->{$leaf}
3941 or return;
3942
3943 # clear all symbols
3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3945 for my $name (keys %$leaf_symtab) {
3946 _gv_clear *{"$pkg$name"};
3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3948 }
3351} 3949}
3352 3950
3353sub do_reload_perl() { 3951sub do_reload_perl() {
3354 # can/must only be called in main 3952 # can/must only be called in main
3355 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3356 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3357 return; 3955 return;
3358 } 3956 }
3359 3957
3360 warn "reloading..."; 3958 return if $RELOAD++;
3361 3959
3362 warn "entering sync_job"; 3960 my $t1 = AE::time;
3363 3961
3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3965
3966 trace "perl_reload: entering sync_job";
3967
3364 cf::sync_job { 3968 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark
3366 cf::emergency_save; 3969 #cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark
3368 3970
3369 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV;
3371
3372 # if anything goes wrong in here, we should simply crash as we already saved
3373
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378
3379 warn "flushing outstanding aio requests";
3380 for (;;) {
3381 BDB::flush;
3382 IO::AIO::flush;
3383 Coro::cede_notself;
3384 last unless IO::AIO::nreqs || BDB::nreqs;
3385 warn "iterate...";
3386 }
3387
3388 ++$RELOAD;
3389
3390 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3391 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3392 %EXT_CORO = (); 3973 %EXT_CORO = ();
3393 3974
3394 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3395 %COMMAND = (); 3976 %COMMAND = ();
3396 3977
3397 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3398 %EXTCMD = (); 3979 %EXTCMD = ();
3399 %EXTICMD = (); 3980 %EXTICMD = ();
3400 3981
3401 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3402 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3403 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3404 3985
3405 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3406 eval { 3987 eval {
3407 $cb->($pkg); 3988 $cb->($pkg);
3408 1 3989 1
3409 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3991 }
3992
3993 trace "... clearing $pkg";
3994 clear_package $pkg;
3410 } 3995 }
3411 3996
3412 warn "... nuking $pkg";
3413 Symbol::delete_package $pkg;
3414 }
3415
3416 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3417 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3418 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419 4000
3420 warn "... unloading $k"; 4001 trace "... unloading $k";
3421 delete $INC{$k}; 4002 delete $INC{$k};
3422 4003
3423 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3424 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3425 4006
3426 if (my $cb = $k->can ("unload_module")) { 4007 if (my $cb = $k->can ("unload_module")) {
3427 $cb->(); 4008 $cb->();
4009 }
4010
4011 clear_package $k;
3428 } 4012 }
3429 4013
3430 Symbol::delete_package $k;
3431 }
3432
3433 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3434 Symbol::delete_package "safe::$_" 4015 clear_package "safe::$_"
3435 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436 4017
3437 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3438 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3439 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3440 4021
3441 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3442 # and global variables created in xs 4023 # and global variables created in xs
3443 #Symbol::delete_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3444 4025
3445 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3446 4027
3447 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3448 require cf; 4029 require cf;
3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3450 4031
3451 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3452 cf::reload_config; 4033 cf::reload_config;
3453 4034
3454 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3455 cf::load_extensions; 4036 cf::load_extensions;
3456 4037
4038 if ($REATTACH_ON_RELOAD) {
3457 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3458 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3459 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3460 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3461 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3462 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3463 4046
3464 warn "leaving sync_job"; 4047 cf::_post_init 1;
3465 4048
4049 trace "perl_reload: leaving sync_job";
4050
3466 1 4051 1
3467 } or do { 4052 } or do {
3468 warn $@; 4053 error $@;
3469 warn "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3470 exit 1; 4055 };
4056
4057 --$RELOAD;
3471 }; 4058 }
3472 4059
3473 warn "reloaded"; 4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3474}; 4062};
3475 4063
3476our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3477 4065
3478sub reload_perl() { 4066sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3481 4069
3482 $RELOAD_WATCHER ||= Event->timer ( 4070 $RELOAD_WATCHER ||= cf::async {
3483 reentrant => 0, 4071 Coro::AIO::aio_wait cache_extensions;
3484 after => 0, 4072
3485 data => WF_AUTOCANCEL, 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3486 cb => sub {
3487 do_reload_perl; 4074 do_reload_perl;
3488 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
3489 }, 4076 };
3490 ); 4077 };
3491} 4078}
3492 4079
3493register_command "reload" => sub { 4080register_command "reload" => sub {
3494 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3495 4082
3500 reload_perl; 4087 reload_perl;
3501 }; 4088 };
3502 } 4089 }
3503}; 4090};
3504 4091
3505unshift @INC, $LIBDIR; 4092#############################################################################
3506 4093
3507my $bug_warning = 0; 4094my $bug_warning = 0;
3508 4095
3509our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3511 4098
3512sub wait_for_tick { 4099sub wait_for_tick() {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3515 4101
3516 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait; 4104 $signal->wait;
3519} 4105}
3520 4106
3521sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3522 return unless $TICK_WATCHER->is_active;
3523 return if $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3524 4109
3525 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 4112 $signal->wait;
3528} 4113}
3529 4114
3530$TICK_WATCHER = Event->timer ( 4115sub tick {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 4116 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 4118 unless ++$bug_warning > 10;
3540 return; 4119 return;
3541 } 4120 }
3542 4121
3543 $NOW = $tick_start = Event::time;
3544
3545 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3546 4123
3547 $RUNTIME += $TICK; 4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3548 $NEXT_TICK += $TICK;
3549 4125
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 4128 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 4130 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3556 };
3557 } 4132 };
4133 }
3558 4134
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 4136 $sig->send;
3561 } 4137 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 4138 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 4139 $sig->send;
3564 } 4140 }
3565 4141
3566 $NOW = Event::time; 4142 $LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 4144
3577 _post_tick; 4145 if (0) {
4146 if ($NEXT_TICK) {
4147 my $jitter = $TICK_START - $NEXT_TICK;
4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4149 debug "jitter $JITTER\n";#d#
4150 }
3578 }, 4151 }
3579); 4152}
3580 4153
3581{ 4154{
4155 # configure BDB
4156
3582 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3583 BDB::max_poll_time $TICK * 0.1; 4158 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 4159 $AnyEvent::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 4160
3608 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4163 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611 | BDB::LOG_AUTOREMOVE, 1); 4164 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4165 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4166 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4167 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614 4168
3615 cf::sync_job { 4169 cf::sync_job {
3616 eval { 4170 eval {
3626 4180
3627 cf::cleanup "db_env_open(db): $@" if $@; 4181 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 4182 };
3629 } 4183 }
3630 4184
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 4185 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4186 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 4187 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4188 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4189 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 4190 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 4191 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4192 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 4193 };
3661} 4194}
3662 4195
3663{ 4196{
4197 # configure IO::AIO
4198
3664 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 4201 undef $AnyEvent::AIO::WATCHER;
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 4202}
3677 4203
3678my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3679 4206
3680sub _log_backtrace { 4207sub _log_backtrace {
3681 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3682 4209
3683 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3684 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3685 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3686 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3687 ++$_log_backtrace; 4218 ++$_log_backtrace;
4219 my $perl_bt = Carp::longmess $msg;
3688 async { 4220 async {
3689 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
3690 4222
3691 my @bt = fork_call { 4223 my @bt = fork_call {
3692 @addr = map { sprintf "%x", $_ } @addr; 4224 @addr = map { sprintf "%x", $_ } @addr;
3703 } 4235 }
3704 4236
3705 @funcs 4237 @funcs
3706 }; 4238 };
3707 4239
3708 LOG llevInfo, "[ABT] $msg\n"; 4240 LOG llevInfo, "[ABT] $perl_bt\n";
4241 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3710 --$_log_backtrace; 4243 --$_log_backtrace;
3711 }; 4244 };
3712 } else { 4245 } else {
3713 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3714 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3715 } 4248 }
3716} 4249}
3717 4250
3718# load additional modules 4251# load additional modules
3719use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3720 4254
3721END { cf::emergency_save } 4255END { cf::emergency_save }
3722 4256
37231 42571
3724 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines