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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines