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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines