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.380 by root, Mon Oct 8 13:58:07 2007 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines