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.395 by root, Sat Nov 10 22:41:59 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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
… …
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;
… …
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
… …
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
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1830
1640=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1641 1832
1642Sends an ext reply to the player. 1833Sends an ext reply to the player.
1643 1834
… …
1675 1866
1676=cut 1867=cut
1677 1868
1678sub find_by_path($) { 1869sub find_by_path($) {
1679 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1680 1873
1681 my ($match, $specificity); 1874 my ($match, $specificity);
1682 1875
1683 for my $region (list) { 1876 for my $region (list) {
1684 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
… …
1710our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1712 1905
1713sub generate_random_map { 1906sub generate_random_map {
1714 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1715 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1716 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1720 $rmp->{exit_on_final_map},
1721 $rmp->{xsize}, $rmp->{ysize},
1722 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1723 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1724 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1725 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1726 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1727 (cf::region::find $rmp->{region}), $rmp->{custom}
1728 )
1729} 1912}
1730 1913
1731=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1732 1915
1733Register 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
… …
1738 1921
1739sub register { 1922sub register {
1740 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1741 my $pkg = caller; 1924 my $pkg = caller;
1742 1925
1743 no strict;
1744 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1745 1927
1746 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1747} 1929}
1748 1930
1749# also paths starting with '/' 1931# also paths starting with '/'
1750$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1751 1933
1752sub thawer_merge { 1934sub thawer_merge {
1753 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1754 1936
1755 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1760} 1942}
1761 1943
1762sub normalise { 1944sub normalise {
1763 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1764 1946
1765 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1766 1948
1767 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1768 1950
1769 # map plan: 1951 # map plan:
1770 # 1952 #
… …
1772 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1773 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1774 # ?random/... random maps 1956 # ?random/... random maps
1775 # /... normal maps 1957 # /... normal maps
1776 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1777 1960
1778 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1779 1962
1780 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1781 # something that looks reasonable 1964 # something that looks reasonable
1782 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1783 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1784 1967
1785 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1786 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1787 } 1984 }
1788 1985
1789 for ($path) { 1986 for ($path) {
1790 redo if s{//}{/};
1791 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1792 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1793 } 1989 }
1794 1990
1795 $path 1991 $path
… …
1809 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1810 return $self; 2006 return $self;
1811 } 2007 }
1812 } 2008 }
1813 2009
1814 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1815 () 2011 ()
1816} 2012}
1817 2013
2014# may re-bless or do other evil things
1818sub init { 2015sub init {
1819 my ($self) = @_; 2016 my ($self) = @_;
1820 2017
1821 $self 2018 $self
1822} 2019}
… …
1841 2038
1842# the temporary/swap location 2039# the temporary/swap location
1843sub save_path { 2040sub save_path {
1844 my ($self) = @_; 2041 my ($self) = @_;
1845 2042
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1848} 2045}
1849 2046
1850# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1851sub uniq_path { 2048sub uniq_path {
1852 my ($self) = @_; 2049 my ($self) = @_;
1853 2050
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 2053}
1866 2054
1867sub decay_objects { 2055sub decay_objects {
1868 my ($self) = @_; 2056 my ($self) = @_;
1869 2057
… …
1951 2139
1952sub find; 2140sub find;
1953sub find { 2141sub find {
1954 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1955 2143
2144 cf::cede_to_tick;
2145
1956 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1957 2147
1958 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2150
1961 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1966 or return; 2153 or return;
1967 2154
1968 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1969 2156
… …
1971 or return; 2158 or return;
1972 2159
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
1976 undef $guard1; 2164 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2165 $map->reset;
1979 return find $path; 2166 return find $path;
1980 } 2167 }
1981 2168
1982 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1983 } 2170 }
1984} 2171}
1985 2172
1986sub pre_load { } 2173sub pre_load { }
1987sub post_load { } 2174#sub post_load { } # XS
1988 2175
1989sub load { 2176sub load {
1990 my ($self) = @_; 2177 my ($self) = @_;
1991 2178
1992 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
… …
2004 $self->alloc; 2191 $self->alloc;
2005 2192
2006 $self->pre_load; 2193 $self->pre_load;
2007 cf::cede_to_tick; 2194 cf::cede_to_tick;
2008 2195
2196 if (exists $self->{load_path}) {
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2198 $f->skip_block;
2011 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2012 or return; 2200 or return;
2013 2201
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
2015 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2016 2204
2017 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2206 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2021 $self->clear_unique_items; 2209 $self->clear_unique_items;
2022 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2024 } 2213 }
2025 } 2214 }
2026 }
2027 2215
2028 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2029 2218
2030 cf::cede_to_tick; 2219 cf::cede_to_tick;
2031 # now do the right thing for maps 2220 # now do the right thing for maps
2032 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2033 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2037 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2227 $self->decay_objects;
2039 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
2040 $self->update_buttons; 2229 $self->update_buttons;
2041 cf::cede_to_tick; 2230 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2231 $self->activate;
2045 } 2232 }
2046 2233
2047 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
2049 2236
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2238 }
2052 2239
2053 $self->post_load; 2240 $self->post_load;
2054}
2055 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2056sub customise_for { 2248sub customise_for {
2057 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2058 2250
2059 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2060 if $self->per_player; 2252 if $self->per_player;
… …
2076 or next; 2268 or next;
2077 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2078 or next; 2270 or next;
2079 $neigh->load; 2271 $neigh->load;
2080 2272
2273 # now find the diagonal neighbours
2081 push @neigh, 2274 push @neigh,
2082 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2083 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2084 } 2277 }
2085 2278
… …
2092} 2285}
2093 2286
2094sub find_sync { 2287sub find_sync {
2095 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2096 2289
2097 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2098} 2294}
2099 2295
2100sub do_load_sync { 2296sub do_load_sync {
2101 my ($map) = @_; 2297 my ($map) = @_;
2102 2298
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2105 2301
2106 cf::sync_job { $map->load }; 2302 $map->load;
2107} 2303}
2108 2304
2109our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2110our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2111 2307
2112sub find_async { 2308sub find_async {
2113 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2114 2310
2115 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2116 2312
2117 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2315 }
2120 2316
2121 $MAP_PREFETCH{$path} |= $load; 2317 $MAP_PREFETCH{$path} |= $load;
2122 2318
2123 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
… …
2137 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2138 2334
2139 () 2335 ()
2140} 2336}
2141 2337
2338# common code, used by both ->save and ->swapout
2142sub save { 2339sub _save {
2143 my ($self) = @_; 2340 my ($self) = @_;
2144
2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
2146 2341
2147 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2148 2343
2149 return unless $self->dirty; 2344 return unless $self->dirty;
2150 2345
… …
2159 2354
2160 cf::async { 2355 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2356 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2163 }; 2358 };
2359
2360 cf::get_slot 0.02;
2164 2361
2165 if ($uniq) { 2362 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2365 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2367 }
2171} 2368}
2172 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2173sub swap_out { 2378sub swap_out {
2174 my ($self) = @_; 2379 my ($self) = @_;
2175 2380
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2181 return if $self->players; 2385 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2183 return if $self->{deny_save};
2184 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2186 2437
2187 $self->deactivate; 2438 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2440 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2441
2235 $self->unlink_save; 2442 $self->unlink_save;
2236 $self->destroy; 2443 $self->destroy;
2237} 2444}
2238 2445
… …
2246 2453
2247 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2248 2455
2249 $self->unlink_save; 2456 $self->unlink_save;
2250 2457
2251 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2463
… …
2305 2512
2306sub unique_maps() { 2513sub unique_maps() {
2307 [ 2514 [
2308 map { 2515 map {
2309 utf8::decode $_; 2516 utf8::decode $_;
2310 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2311 ? normalise $_ 2520 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2522 ]
2315} 2523}
2316 2524
2317package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2318 2556
2319=back 2557=back
2320 2558
2321=head3 cf::object 2559=head3 cf::object
2322 2560
… …
2326 2564
2327=over 4 2565=over 4
2328 2566
2329=item $ob->inv_recursive 2567=item $ob->inv_recursive
2330 2568
2331Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
2332 2571
2333=cut 2572=cut
2334 2573
2335sub inv_recursive_; 2574sub inv_recursive_;
2336sub inv_recursive_ { 2575sub inv_recursive_ {
… …
2341 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2342} 2581}
2343 2582
2344=item $ref = $ob->ref 2583=item $ref = $ob->ref
2345 2584
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2585Creates and returns a persistent reference to an object that can be stored as a string.
2347 2586
2348=item $ob = cf::object::deref ($refstring) 2587=item $ob = cf::object::deref ($refstring)
2349 2588
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2590even if the object actually exists. May block.
… …
2383can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2623dialogue with the given NPC character.
2385 2624
2386=cut 2625=cut
2387 2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
2640
2388# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2642# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2645 my ($self, $npc, $msg, $flags) = @_;
… …
2403 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2658
2406 } else { 2659 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2662 }
2410 } 2663 }
2411} 2664}
2412 2665
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2438 2691
2439=item $player_object->enter_link 2692=item $player_object->enter_link
2440 2693
2441Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2442 2695
2443The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
2444I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
2445 2700
2446Will never block. 2701Will never block.
2447 2702
2448=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2449 2704
… …
2469sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2470 my ($self) = @_; 2725 my ($self) = @_;
2471 2726
2472 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2473 2728
2729 ++$self->{_link_recursion};
2730
2474 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2475 2732
2476 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2477 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2478 2735
2479 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2480} 2737}
2481 2738
2482sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2483 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2484 2741
… …
2501 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2502 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2503 2760
2504 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2505 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2506 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2507 2764
2508 $map->load; 2765 $map->load;
2509 $map->load_neighbours; 2766 $map->load_neighbours;
2510 2767
2511 return unless $self->contr->active; 2768 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2769
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2516} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2517 2777
2778}
2779
2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2519 2781
2520Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2521her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2522that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2523the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process. 2786be called at the end of this process.
2525 2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2790
2526=cut 2791=cut
2527 2792
2528our $GOTOGEN; 2793our $GOTOGEN;
2529 2794
2530sub cf::object::player::goto { 2795sub cf::object::player::goto {
2531 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2532 2803
2533 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2535 2806
2536 $self->enter_link; 2807 $self->enter_link;
… …
2556 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2557 } 2828 }
2558 } 2829 }
2559 2830
2560 my $map = eval { 2831 my $map = eval {
2561 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2562 2833
2563 if ($map) { 2834 if ($map) {
2564 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2565 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2566 } else { 2837 } else {
2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 } 2839 }
2569 2840
2570 $map 2841 $map
… …
2578 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2579 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2580 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2581 } 2852 }
2582 2853
2583 $done->() if $done; 2854 $done->($self) if $done;
2584 })->prio (1); 2855 })->prio (1);
2585} 2856}
2586 2857
2587=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2588 2859
… …
2608} 2879}
2609 2880
2610sub prepare_random_map { 2881sub prepare_random_map {
2611 my ($exit) = @_; 2882 my ($exit) = @_;
2612 2883
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2886 # that depends on the exit object
2618 2887
2619 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
… …
2621 if ($exit->map) { 2890 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2626 } 2897 }
2627 2898
2628 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2629 2900
2630 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2633 2904
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2907 undef $fh;
2637 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2638 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2641 } 2916 }
2642} 2917}
2643 2918
2644sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2646 2921
2647 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2648 2923
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2924 $self->enter_link;
2661 2925
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2926 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2927 $Coro::current->{desc} = "enter_exit";
2668 2928
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2671 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2672 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2673 1; 2950 1
2674 }) { 2951 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2956
2680 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2681 $self->leave_link; 2958 $self->leave_link;
2682 } 2959 }
2683 })->prio (1); 2960 })->prio (1);
2684} 2961}
2685 2962
… …
2697sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2698 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2699 2976
2700 utf8::encode $text; 2977 utf8::encode $text;
2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2702} 3004}
2703 3005
2704=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2705 3007
2706Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2710 3012
2711=cut 3013=cut
2712 3014
2713# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2714our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2715 "c/identify" => { 3023 "c/identify" => {
2716 id => "infobox", 3024 id => "infobox",
2717 title => "Identify", 3025 title => "Identify",
2718 reply => undef, 3026 reply => undef,
2719 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
… …
2721 "c/examine" => { 3029 "c/examine" => {
2722 id => "infobox", 3030 id => "infobox",
2723 title => "Examine", 3031 title => "Examine",
2724 reply => undef, 3032 reply => undef,
2725 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
2726 }, 3040 },
2727 "c/book" => { 3041 "c/book" => {
2728 id => "infobox", 3042 id => "infobox",
2729 title => "Book", 3043 title => "Book",
2730 reply => undef, 3044 reply => undef,
… …
2746 id => "infobox", 3060 id => "infobox",
2747 title => "Body Parts", 3061 title => "Body Parts",
2748 reply => undef, 3062 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 3063 tooltip => "Shows which body parts you posess and are available",
2750 }, 3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
2751 "c/uptime" => { 3101 "c/uptime" => {
2752 id => "infobox", 3102 id => "infobox",
2753 title => "Uptime", 3103 title => "Uptime",
2754 reply => undef, 3104 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 3105 tooltip => "How long the server has been running since last restart",
… …
2758 id => "infobox", 3108 id => "infobox",
2759 title => "Map Info", 3109 title => "Map Info",
2760 reply => undef, 3110 reply => undef,
2761 tooltip => "Information related to the maps", 3111 tooltip => "Information related to the maps",
2762 }, 3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2763); 3127);
2764 3128
2765sub cf::client::send_msg { 3129sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2767 3131
2768 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2769 3134
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 3136
2772 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 3138 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 3139 $channel = $CHANNEL{$channel};
2775 3140
2776 $self->ext_msg (channel_info => $channel) 3141 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 3142 $channel = $channel->{id};
2780 3143
2781 } elsif (ref $channel) { 3144 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 3149 }
2788 3150
2789 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2790 } 3152 }
2791 3153
2792 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2793 3155
2794 if ($self->can_msg) {
2795 # default colour, mask it out 3156 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2798 3159
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 3163 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 3164
2813 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826} 3166}
2827 3167
2828=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2829 3169
2830Sends an ext event to the client. 3170Sends an ext event to the client.
… …
2833 3173
2834sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2835 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2836 3176
2837 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2840 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 } 3182 }
2843} 3183}
2844 3184
2845=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2846 3186
… …
2850 3190
2851sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2853 3193
2854 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove 3197 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 } 3200 }
2861} 3201}
2862 3202
2863=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2864 3204
… …
2935 3275
2936 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
2937 if $reply; 3277 if $reply;
2938 3278
2939 } else { 3279 } else {
2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2941 } 3281 }
2942 3282
2943 cf::override; 3283 cf::override;
2944 }, 3284 },
2945); 3285);
… …
2965 3305
2966 $coro 3306 $coro
2967} 3307}
2968 3308
2969cf::client->attach ( 3309cf::client->attach (
2970 on_destroy => sub { 3310 on_client_destroy => sub {
2971 my ($ns) = @_; 3311 my ($ns) = @_;
2972 3312
2973 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2974 }, 3314 },
2975); 3315);
… …
2991our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2992 3332
2993$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2994 3334
2995$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
2997 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
2998 sort time 3338 sort time
2999)); 3339));
3000 3340
3001# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
… …
3004 3344
3005The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
3006 3346
3007 cf::object 3347 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3348 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3349 insert remove name archname title slaying race decrease split
3350 value
3010 3351
3011 cf::object::player 3352 cf::object::player
3012 player 3353 player
3013 3354
3014 cf::player 3355 cf::player
… …
3019 3360
3020=cut 3361=cut
3021 3362
3022for ( 3363for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3029) { 3370) {
3030 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3033 for @funs; 3373 for @funs;
3034} 3374}
3035 3375
… …
3050 3390
3051 my $qcode = $code; 3391 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3054 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
3055 local $_; 3398 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars;
3057 3399
3058 my $eval = 3400 my $eval =
3059 "do {\n" 3401 "do {\n"
3060 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3061 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3062 . $code 3404 . $code
3063 . "\n}" 3405 . "\n}"
3064 ; 3406 ;
3065 3407
3408 if ($CFG{safe_eval}) {
3066 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3067 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3068 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
3069 3417
3070 if ($@) { 3418 if ($@) {
3071 warn "$@"; 3419 warn "$@",
3072 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3073 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3074 } 3422 }
3075 3423
3076 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3077} 3425}
3078 3426
… …
3092=cut 3440=cut
3093 3441
3094sub register_script_function { 3442sub register_script_function {
3095 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3096 3444
3097 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3098 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3099} 3447}
3100 3448
3101=back 3449=back
3102 3450
3103=cut 3451=cut
… …
3112 # for this (global event?) 3460 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3114 3462
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116 3464
3117 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3118 3466
3119 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3120 0 < aio_load $path, $facedata
3121 or die "$path: $!";
3122
3123 $facedata = Coro::Storable::thaw $facedata;
3124 3468
3125 $facedata->{version} == 2 3469 $facedata->{version} == 2
3126 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127 3471
3128 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3129 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC, 3475 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3132 }; 3478 };
3133 cf::cede_to_tick; 3479 cf::cede_to_tick;
3134 3480
3135 { 3481 {
3136 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3137 3483
3138 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
3140 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3144 3492
3145 cf::cede_to_tick; 3493 cf::cede_to_tick;
3146 } 3494 }
3147 3495
3148 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
3150 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
3151 or next; 3500 or next;
3501
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3505 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3157 } 3507 }
3158 3508
3159 cf::cede_to_tick; 3509 cf::cede_to_tick;
3160 } 3510 }
3161 } 3511 }
… …
3170 3520
3171 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3172 } 3522 }
3173 3523
3174 { 3524 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3178 3526
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184 3530
3185 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3186 # prepend meta info 3532 cf::face::set_type $idx, $info->{type};
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else { 3533 } else {
3195 $data = $info->{data}; 3534 $RESOURCE{$name} = $info; # unused
3196 } 3535 }
3197 3536
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3537 cf::cede_to_tick;
3202 } 3538 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3542
3223 1 3543 1
3224} 3544}
3225 3545
3226register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
… …
3228 3548
3229 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
3231 } 3551 }
3232}; 3552};
3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3233 3563
3234sub reload_regions { 3564sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3565 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3566 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3567 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3251} 3581}
3252 3582
3253sub reload_archetypes { 3583sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3586}
3262 3587
3263sub reload_treasures { 3588sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3266} 3591}
3267 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3268sub reload_resources { 3613sub reload_resources {
3269 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3270 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
3271 reload_regions; 3621 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3622 reload_treasures;
3276 3623
3277 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3278}
3279
3280sub init {
3281 reload_resources;
3282} 3625}
3283 3626
3284sub reload_config { 3627sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3286 or return;
3287 3629
3288 local $/; 3630 my $config = load_file "$CONFDIR/config";
3289 *CFG = YAML::Syck::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3290 3633
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3292 3635
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3295 3638
3296 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
… …
3300 }; 3643 };
3301 warn $@ if $@; 3644 warn $@ if $@;
3302 } 3645 }
3303} 3646}
3304 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3305sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
3306 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3689 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3691 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3313 }; 3693 };
3314 3694
3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3315 reload_config; 3707 reload_config;
3316 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
3317 load_extensions; 3718 load_extensions;
3318 3719
3319 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3320 Event::loop; 3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3321} 3738}
3322 3739
3323############################################################################# 3740#############################################################################
3324# initialisation and cleanup 3741# initialisation and cleanup
3325 3742
3326# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3327BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3336 },
3337 ); 3749 };
3338 } 3750 }
3339} 3751}
3340 3752
3341sub write_runtime { 3753sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3343 3755
3344 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3346 3758
3347 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3760
3349 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3350 3762
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3352 or return; 3764 or return;
3353 3765
3354 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
… …
3366 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3367 3779
3368 close $fh 3780 close $fh
3369 or return; 3781 or return;
3370 3782
3371 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3784 and return;
3373 3785
3374 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3375 3787
3376 1 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
3377} 3839}
3378 3840
3379sub emergency_save() { 3841sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3381 3843
3382 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3383 3850
3384 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3385 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3860 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3862 $pl->save;
3394 } 3863 }
3395 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3396 3865
3397 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3398 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3871 $map->valid or next;
3401 $map->save; 3872 $map->save;
3402 } 3873 }
3403 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3404 3875
3405 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3408 }; 3904 };
3409 3905
3410 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3411} 3907}
3412 3908
3413sub post_cleanup { 3909sub post_cleanup {
3414 my ($make_core) = @_; 3910 my ($make_core) = @_;
3415 3911
3912 IO::AIO::flush;
3913
3416 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
3418} 3944}
3419 3945
3420sub do_reload_perl() { 3946sub do_reload_perl() {
3421 # can/must only be called in main 3947 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3423 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3424 return; 3950 return;
3425 } 3951 }
3426 3952
3427 warn "reloading..."; 3953 return if $RELOAD++;
3428 3954
3429 warn "entering sync_job"; 3955 my $t1 = AE::time;
3430 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
3431 cf::sync_job { 3963 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark
3433 cf::emergency_save; 3964 #cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark
3435 3965
3436 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV;
3438
3439 # if anything goes wrong in here, we should simply crash as we already saved
3440
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs;
3452 warn "iterate...";
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = (); 3968 %EXT_CORO = ();
3460 3969
3461 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3462 %COMMAND = (); 3971 %COMMAND = ();
3463 3972
3464 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3465 %EXTCMD = (); 3974 %EXTCMD = ();
3466 %EXTICMD = (); 3975 %EXTICMD = ();
3467 3976
3468 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3469 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3471 3980
3472 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3473 eval { 3982 eval {
3474 $cb->($pkg); 3983 $cb->($pkg);
3475 1 3984 1
3476 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
3477 } 3990 }
3478 3991
3479 warn "... nuking $pkg";
3480 Symbol::delete_package $pkg;
3481 }
3482
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3484 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3995
3487 warn "... unloading $k"; 3996 trace "... unloading $k";
3488 delete $INC{$k}; 3997 delete $INC{$k};
3489 3998
3490 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3492 4001
3493 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3494 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3495 } 4007 }
3496 4008
3497 Symbol::delete_package $k;
3498 }
3499
3500 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 4012
3504 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 4016
3508 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3509 # and global variables created in xs 4018 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3511 4020
3512 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3513 4022
3514 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3515 require cf; 4024 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3517 4026
3518 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3519 cf::reload_config; 4028 cf::reload_config;
3520 4029
3521 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3522 cf::load_extensions; 4031 cf::load_extensions;
3523 4032
4033 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3527 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3530 4041
3531 warn "leaving sync_job"; 4042 cf::_post_init 1;
3532 4043
4044 trace "perl_reload: leaving sync_job";
4045
3533 1 4046 1
3534 } or do { 4047 } or do {
3535 warn $@; 4048 error $@;
3536 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3537 exit 1; 4050 };
4051
4052 --$RELOAD;
3538 }; 4053 }
3539 4054
3540 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3541}; 4057};
3542 4058
3543our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3544 4060
3545sub reload_perl() { 4061sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3548 4064
3549 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 4067
3552 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 4069 do_reload_perl;
3555 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3556 }, 4071 };
3557 ); 4072 };
3558} 4073}
3559 4074
3560register_command "reload" => sub { 4075register_command "reload" => sub {
3561 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3562 4077
… …
3567 reload_perl; 4082 reload_perl;
3568 }; 4083 };
3569 } 4084 }
3570}; 4085};
3571 4086
3572unshift @INC, $LIBDIR; 4087#############################################################################
3573 4088
3574my $bug_warning = 0; 4089my $bug_warning = 0;
3575 4090
3576our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3578 4093
3579sub wait_for_tick { 4094sub wait_for_tick() {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 4096
3583 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 4099 $signal->wait;
3586} 4100}
3587 4101
3588sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 4104
3592 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 4107 $signal->wait;
3595} 4108}
3596 4109
3597$TICK_WATCHER = Event->timer ( 4110sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3607 return; 4114 return;
3608 } 4115 }
3609 4116
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3613 4118
3614 $RUNTIME += $TICK; 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK += $TICK;
3616 4120
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 4123 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 4125 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3623 };
3624 } 4127 };
4128 }
3625 4129
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 4131 $sig->send;
3628 } 4132 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 4134 $sig->send;
3631 } 4135 }
3632 4136
3633 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 4139
3644 _post_tick; 4140 if (0) {
4141 if ($NEXT_TICK) {
4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
3645 }, 4146 }
3646); 4147}
3647 4148
3648{ 4149{
4150 # configure BDB
4151
3649 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3650 BDB::max_poll_time $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 4154 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 4155
3675 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 4163
3682 cf::sync_job { 4164 cf::sync_job {
3683 eval { 4165 eval {
… …
3693 4175
3694 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 4177 };
3696 } 4178 }
3697 4179
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 4180 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4181 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 4182 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4183 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 4185 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 4188 };
3728} 4189}
3729 4190
3730{ 4191{
4192 # configure IO::AIO
4193
3731 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 4197}
3744 4198
3745my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3746 4201
3747sub _log_backtrace { 4202sub _log_backtrace {
3748 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3749 4204
3750 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3751 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3752 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3754 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3755 async { 4215 async {
3756 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3757 4217
3758 my @bt = fork_call { 4218 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
… …
3770 } 4230 }
3771 4231
3772 @funcs 4232 @funcs
3773 }; 4233 };
3774 4234
3775 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 4238 --$_log_backtrace;
3778 }; 4239 };
3779 } else { 4240 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3782 } 4243 }
3783} 4244}
3784 4245
3785# load additional modules 4246# load additional modules
3786use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3787 4249
3788END { cf::emergency_save } 4250END { cf::emergency_save }
3789 4251
37901 42521
3791 4253

Diff Legend

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