ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines