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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use 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; 126our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 129our $DB_ENV;
88 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
89our %CFG; 133our %CFG;
90 134
91our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 136our $RUNTIME;
137our $NOW;
93 138
94our (%PLAYER, %PLAYER_LOADING); # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 140our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
97 142
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 145
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
103our $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 :)
104 155
105binmode STDOUT; 156binmode STDOUT;
106binmode STDERR; 157binmode STDERR;
107 158
108# read virtual server time, if available 159# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
113} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
114 167
115mkdir $_ 168mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 170
118our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
119 172
120sub 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::"} };
121 189
122############################################################################# 190#############################################################################
123 191
124=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
125 193
161 229
162The raw value load value from the last tick. 230The raw value load value from the last tick.
163 231
164=item %cf::CFG 232=item %cf::CFG
165 233
166Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 235from wherever your confdir points to.
168 236
169=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
170 238
171These 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
172returns 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
173per 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.
174 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
175=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
176 249
177This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 252that call.
180 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
181=back 260=back
182 261
183=cut 262=cut
184 263
185BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
186 *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 {
187 my $msg = join "", @_; 271 my $msg = join "", @_;
188 272
189 $msg .= "\n" 273 $msg .= "\n"
190 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
191 275
192 $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;
193 277
194 LOG llevError, $msg; 278 LOG llevWarn, $msg;
195 }; 279};
196} 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};
197 294
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 305for my $pkg (qw(
209 cf::global cf::attachable 306 cf::global cf::attachable
210 cf::object cf::object::player 307 cf::object cf::object::player
211 cf::client cf::player 308 cf::client cf::player
212 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
213 cf::map cf::party cf::region 311 cf::party cf::region
214)) { 312)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 314}
218 315
219$Event::DIED = sub { 316$EV::DIED = sub {
220 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
221}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
222 324
223############################################################################# 325#############################################################################
224 326
225=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
226 328
247 $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;
248 $d 350 $d
249 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
250} 352}
251 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
252=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
253 369
254Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
255 371
256=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
257 373
258Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
259 375
260=cut 376=cut
261 377
262our $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
263 379
264sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
265sub 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}
266 444
267=item cf::lock_wait $string 445=item cf::lock_wait $string
268 446
269Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
270 448
271=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
272 450
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
276returned. 454returned.
277 455
278Locks 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
279deadlocked coro. 457deadlocked coro.
285 463
286Return 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.
287 465
288=cut 466=cut
289 467
290our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 469
293sub lock_wait($) { 470sub lock_wait($) {
294 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 472}
307 473
308sub lock_acquire($) { 474sub lock_acquire($) {
309 my ($key) = @_; 475 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 476}
323 477
324sub lock_active($) { 478sub lock_active($) {
325 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 480}
329 481
330sub freeze_mainloop { 482sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
332 484
333 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 486}
335 }; 487
336 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
337 $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
338} 501}
339 502
340=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
341 504
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
343This 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
344of 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.
345 512
346The 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
347used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
348 515
349Useful for short background jobs. 516Useful for short background jobs.
350 517
351=cut 518=cut
352 519
353our @SLOT_QUEUE; 520our @SLOT_QUEUE;
354our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
355 523
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
358 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
359 530
360 while () { 531 while () {
361 next_job: 532 next_job:
533
362 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 535
364 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 540 $job->[2]->send;
368 Coro::cede; 541 Coro::cede;
369 goto next_job; 542 goto next_job;
370 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 545 }
372 } 546 }
373 547
374 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 551 $signal->wait;
378 } else { 552 } else {
553 $busy = 0;
379 Coro::schedule; 554 Coro::schedule;
380 } 555 }
381 } 556 }
382}; 557};
383 558
384sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
385 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
386 563
387 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
388 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
389 567
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
403 581
404BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
405 583
406=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
407 585
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
410partly 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
411acceptable. 589acceptable.
412 590
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
418=cut 596=cut
419 597
420sub sync_job(&) { 598sub sync_job(&) {
421 my ($job) = @_; 599 my ($job) = @_;
422 600
423 if ($Coro::current == $Coro::main) { 601 if (in_main) {
424 my $time = Event::time; 602 my $time = AE::time;
425 603
426 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
428 606
429 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 608
431 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
432 610
433 my $busy = 1; 611 my $busy = 1;
434 my @res; 612 my @res;
435 613
436 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 616 @res = eval { $job->() };
438 warn $@ if $@; 617 error $@ if $@;
439 undef $busy; 618 undef $busy;
440 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
441 620
442 while ($busy) { 621 while ($busy) {
443 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
444 } 626 }
627 }
445 628
446 $time = Event::time - $time; 629 my $time = AE::time - $time;
447 630
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
452 632
453 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
454 } else { 634 } else {
455 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
456 636
476 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
477 657
478 $coro 658 $coro
479} 659}
480 660
481=item fork_call { }, $args 661=item fork_call { }, @args
482 662
483Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
487 667
488=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
489 673
490sub fork_call(&@) { 674sub fork_call(&@) {
491 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
492 676
493 # 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,
494 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
496 680
497 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
498 reset_signals; 682 cf::post_fork;
499 &$cb 683 &$cb
500 }, @args; 684 } @args;
501 685
502 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
503} 725}
504 726
505=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
506 728
507Returns a single value from the environment database. 729Returns a single value from the environment database.
517within each server. 739within each server.
518 740
519=cut 741=cut
520 742
521sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
522 my ($name) = @_; 747 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
524 749
525 eval { 750 eval {
526 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
536} 761}
537 762
538our $DB; 763our $DB;
539 764
540sub db_init { 765sub db_init {
541 cf::sync_job {
542 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
543 };
544} 767}
545 768
546sub db_get($$) { 769sub db_get($$) {
547 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
548 771
549 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
550 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
551 776
552 $! ? () 777 $! ? ()
553 : $data 778 : $data
554 }
555} 779}
556 780
557sub db_put($$$) { 781sub db_put($$$) {
558 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
587 811
588 my @data; 812 my @data;
589 my $md5; 813 my $md5;
590 814
591 for (0 .. $#$src) { 815 for (0 .. $#$src) {
592 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
593 or Carp::croak "$src->[$_]: $!";
594 } 817 }
595 818
596 # if processing is expensive, check 819 # if processing is expensive, check
597 # checksum first 820 # checksum first
598 if (1) { 821 if (1) {
615 838
616 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data); 840 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
619 842
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
621 844
622 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
625 848
635 858
636=cut 859=cut
637 860
638sub datalog($@) { 861sub datalog($@) {
639 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
640 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
641} 864}
642 865
643=back 866=back
644 867
645=cut 868=cut
646 869
647############################################################################# 870#############################################################################
648 871
649=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
650 873
651Many 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
652attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
654 877
655In 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>
656C<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
657Crossfire TRT). 880Deliantra).
658 881
659=over 4 882=over 4
660 883
661=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
662 885
706=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
707 930
708Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
710 933
711Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
712that 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.
713 936
714These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
715 938
716=over 4 939=over 4
840 1063
841 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
842 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
843 1066
844 } elsif (ref $type) { 1067 } elsif (ref $type) {
845 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
846 1069
847 } else { 1070 } else {
848 shift @arg; 1071 shift @arg;
849 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
850 } 1073 }
851 } 1074 }
852} 1075}
853 1076
854sub _object_attach { 1077sub _object_attach {
864 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
865 } 1088 }
866 1089
867 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
868 } else { 1091 } else {
869 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
870 } 1093 }
871 1094
872 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
873} 1096}
874 1097
933 1156
934 for (@$callbacks) { 1157 for (@$callbacks) {
935 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
936 1159
937 if ($@) { 1160 if ($@) {
938 warn "$@";
939 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
940 override; 1162 override;
941 } 1163 }
942 1164
943 return 1 if $override; 1165 return 1 if $override;
944 } 1166 }
945 1167
946 0 1168 0
947} 1169}
948 1170
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1172
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1174
953Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
954 1176
960 1182
961=cut 1183=cut
962 1184
963############################################################################# 1185#############################################################################
964# object support 1186# object support
965#
966 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#
967sub _can_merge { 1221sub _can_merge {
968 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
969 1223
970 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1225
974 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
975} 1228}
976 1229
977sub reattach { 1230sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1232 my ($obj) = @_;
980 1233
1234 # no longer needed after getting rid of delete_package?
981 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
982 1236
983 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
984 1238
985 @$registry = (); 1239 @$registry = ();
986 1240
991 for (@$attach) { 1245 for (@$attach) {
992 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
993 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
994 } 1248 }
995 } else { 1249 } else {
996 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
997 } 1251 }
998 } 1252 }
999} 1253}
1000 1254
1001cf::attachable->attach ( 1255cf::attachable->attach (
1002 prio => -1000000, 1256 prio => -1000000,
1003 on_instantiate => sub { 1257 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1005 1259
1006 $data = from_json $data; 1260 $data = decode_json $data;
1007 1261
1008 for (@$data) { 1262 for (@$data) {
1009 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1010 1264
1011 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1025); 1279);
1026 1280
1027sub object_freezer_save { 1281sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1029 1283
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1284 sync_job {
1033 if (length $$rdata) { 1285 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1037 1290
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 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 }
1042 close $fh; 1298 aio_close $fh;
1043 1299
1044 if (@$objs) { 1300 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1049 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 }
1050 close $fh; 1309 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1311 }
1053 } else { 1312 } else {
1054 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1055 } 1314 }
1056 1315
1057 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1320 } else {
1059 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1060 } 1322 }
1061 } else { 1323 } else {
1062 aio_unlink $filename; 1324 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1064 } 1326 }
1065 }; 1327 };
1066
1067 undef $guard;
1068} 1328}
1069 1329
1070sub object_freezer_as_string { 1330sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1072 1332
1077 1337
1078sub object_thawer_load { 1338sub object_thawer_load {
1079 my ($filename) = @_; 1339 my ($filename) = @_;
1080 1340
1081 my ($data, $av); 1341 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1342
1085 (aio_load $filename, $data) >= 0 1343 (aio_load $filename, $data) >= 0
1086 or return; 1344 or return;
1087 1345
1088 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1348 or return;
1091 1349
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1094 } 1352 }
1095 1353
1096 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1099 1358
1100 ($data, $av) 1359 ($data, $av)
1101} 1360}
1102 1361
1103=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1159 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1160 1419
1161 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1162} 1421}
1163 1422
1423use File::Glob ();
1424
1164cf::player->attach ( 1425cf::player->attach (
1165 on_command => sub { 1426 on_unknown_command => sub {
1166 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1167 1428
1168 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1169 or return; 1430 or return;
1170 1431
1193 1454
1194 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1195 if $reply; 1456 if $reply;
1196 1457
1197 } else { 1458 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1460 }
1200 1461
1201 cf::override; 1462 cf::override;
1202 }, 1463 },
1203); 1464);
1204 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
1205sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1206 cf::sync_job { 1482 cf::sync_job {
1207 my %todo; 1483 my %todo;
1208 1484
1209 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1210 next unless -r $path; 1486 next unless -r $path;
1228 1504
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1507
1232 $ext{source} = 1508 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1234 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1235 . $source 1511 . $source
1236 . "\n};\n1"; 1512 . "\n};\n1";
1237 1513
1238 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1239 } 1515 }
1240 1516
1517 my $pass = 0;
1241 my %done; 1518 my %done;
1242 while (%todo) { 1519 while (%todo) {
1243 my $progress; 1520 my $progress;
1244 1521
1522 ++$pass;
1523
1524 ext:
1245 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1527 next ext
1248 unless exists $done{$_}; 1528 unless exists $done{$_};
1249 } 1529 }
1250 1530
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1532
1253 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1258 warn $msg; 1540
1259 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1542 delete $todo{$k};
1261 } 1543 } else {
1262 1544 $done{$k} = delete $todo{$k};
1263 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1264 } 1550 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1551 }
1270 1552
1271 skip: 1553 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 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 }
1274 } 1563 }
1275 }; 1564 };
1276} 1565}
1277 1566
1278############################################################################# 1567#############################################################################
1279 1568
1280=back 1569=back
1281 1570
1282=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1283 1572
1284Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1285 1574
1286=cut 1575=cut
1287 1576
1288package cf::player; 1577package cf::player;
1289 1578
1332 1621
1333sub exists($) { 1622sub exists($) {
1334 my ($login) = @_; 1623 my ($login) = @_;
1335 1624
1336 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1338} 1627}
1339 1628
1340sub find($) { 1629sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1631 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1642
1354 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1644 or return;
1356 1645
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1359 or return; 1647 or return;
1648
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1363 } 1652 }
1364 } 1653 }
1365} 1654}
1366 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1367sub save($) { 1669sub save($) {
1368 my ($pl) = @_; 1670 my ($pl) = @_;
1369 1671
1370 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1371 1673
1374 1676
1375 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1376 1678
1377 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1686
1380 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1688 cf::cede_to_tick;
1382} 1689}
1383 1690
1415 my ($pl) = @_; 1722 my ($pl) = @_;
1416 1723
1417 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1418 1725
1419 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1728
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1423 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1425 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1426 1737
1427 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1429 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1467 1778
1468 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1469 my $path = path $login; 1780 my $path = path $login;
1470 1781
1471 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1788 }
1477 1789
1481 1793
1482 \@logins 1794 \@logins
1483} 1795}
1484 1796
1485=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1486 1800
1487Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1488player. May block. 1802player. May block.
1489 1803
1490=cut 1804=cut
1508 } 1822 }
1509 1823
1510 \@paths 1824 \@paths
1511} 1825}
1512 1826
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1828
1515Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1830
1564=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1565 1832
1566Sends an ext reply to the player. 1833Sends an ext reply to the player.
1567 1834
1599 1866
1600=cut 1867=cut
1601 1868
1602sub find_by_path($) { 1869sub find_by_path($) {
1603 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1604 1873
1605 my ($match, $specificity); 1874 my ($match, $specificity);
1606 1875
1607 for my $region (list) { 1876 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1636 1905
1637sub generate_random_map { 1906sub generate_random_map {
1638 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1639 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1640 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1648 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1649 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1650 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1651 (cf::region::find $rmp->{region}), $rmp->{custom}
1652 )
1653} 1912}
1654 1913
1655=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1656 1915
1657Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1662 1921
1663sub register { 1922sub register {
1664 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1924 my $pkg = caller;
1666 1925
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1927
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1929}
1672 1930
1673# also paths starting with '/' 1931# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1933
1676sub thawer_merge { 1934sub thawer_merge {
1677 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1678 1936
1679 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1684} 1942}
1685 1943
1686sub normalise { 1944sub normalise {
1687 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1688 1946
1689 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1690 1948
1691 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1692 1950
1693 # map plan: 1951 # map plan:
1694 # 1952 #
1696 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1697 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1698 # ?random/... random maps 1956 # ?random/... random maps
1699 # /... normal maps 1957 # /... normal maps
1700 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1701 1960
1702 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1703 1962
1704 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1705 # something that looks reasonable 1964 # something that looks reasonable
1706 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1707 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1708 1967
1709 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1710 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1711 } 1984 }
1712 1985
1713 for ($path) { 1986 for ($path) {
1714 redo if s{//}{/};
1715 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1716 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1717 } 1989 }
1718 1990
1719 $path 1991 $path
1733 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1734 return $self; 2006 return $self;
1735 } 2007 }
1736 } 2008 }
1737 2009
1738 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1739 () 2011 ()
1740} 2012}
1741 2013
2014# may re-bless or do other evil things
1742sub init { 2015sub init {
1743 my ($self) = @_; 2016 my ($self) = @_;
1744 2017
1745 $self 2018 $self
1746} 2019}
1765 2038
1766# the temporary/swap location 2039# the temporary/swap location
1767sub save_path { 2040sub save_path {
1768 my ($self) = @_; 2041 my ($self) = @_;
1769 2042
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1772} 2045}
1773 2046
1774# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1775sub uniq_path { 2048sub uniq_path {
1776 my ($self) = @_; 2049 my ($self) = @_;
1777 2050
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 2053}
1790 2054
1791sub decay_objects { 2055sub decay_objects {
1792 my ($self) = @_; 2056 my ($self) = @_;
1793 2057
1820 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1821 2085
1822 1 2086 1
1823} 2087}
1824 2088
2089# used to laod the header of an original map
1825sub load_header_orig { 2090sub load_header_orig {
1826 my ($self) = @_; 2091 my ($self) = @_;
1827 2092
1828 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1829} 2094}
1830 2095
2096# used to laod the header of an instantiated map
1831sub load_header_temp { 2097sub load_header_temp {
1832 my ($self) = @_; 2098 my ($self) = @_;
1833 2099
1834 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1835} 2101}
1836 2102
2103# called after loading the header from an instantiated map
1837sub prepare_temp { 2104sub prepare_temp {
1838 my ($self) = @_; 2105 my ($self) = @_;
1839 2106
1840 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1841 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1842 # safety 2109 # safety
1843 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1844 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1845} 2112}
1846 2113
2114# called after loading the header from an original map
1847sub prepare_orig { 2115sub prepare_orig {
1848 my ($self) = @_; 2116 my ($self) = @_;
1849 2117
1850 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1851 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
1875 2143
1876sub find; 2144sub find;
1877sub find { 2145sub find {
1878 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1879 2147
2148 cf::cede_to_tick;
2149
1880 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1881 2151
1882 cf::lock_wait "map_data:$path";#d#remove 2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2154
1885 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2156 my $map = new_from_path cf::map $path
1890 or return; 2157 or return;
1891 2158
1892 $map->{last_save} = $cf::RUNTIME; 2159 $map->{last_save} = $cf::RUNTIME;
1893 2160
1895 or return; 2162 or return;
1896 2163
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2164 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2165 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2166 #$cf::WAIT_FOR_TICK->wait;
2167 undef $guard2;
1900 undef $guard1; 2168 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2169 $map->reset;
1903 return find $path; 2170 return find $path;
1904 } 2171 }
1905 2172
1906 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
1907 } 2174 }
1908} 2175}
1909 2176
1910sub pre_load { } 2177sub pre_load { }
1911sub post_load { } 2178#sub post_load { } # XS
1912 2179
1913sub load { 2180sub load {
1914 my ($self) = @_; 2181 my ($self) = @_;
1915 2182
1916 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
1928 $self->alloc; 2195 $self->alloc;
1929 2196
1930 $self->pre_load; 2197 $self->pre_load;
1931 cf::cede_to_tick; 2198 cf::cede_to_tick;
1932 2199
2200 if (exists $self->{load_path}) {
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2201 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2202 $f->skip_block;
1935 $self->_load_objects ($f) 2203 $self->_load_objects ($f)
1936 or return; 2204 or return;
1937 2205
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2206 $self->post_load_original
1939 if delete $self->{load_original}; 2207 if delete $self->{load_original};
1940 2208
1941 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2210 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2211 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) { 2212 if (my $f = new_from_file cf::object::thawer $uniq) {
1945 $self->clear_unique_items; 2213 $self->clear_unique_items;
1946 $self->_load_objects ($f); 2214 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs; 2215 $f->resolve_delayed_derefs;
2216 }
1948 } 2217 }
1949 } 2218 }
1950 }
1951 2219
1952 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
1953 2225
1954 cf::cede_to_tick; 2226 cf::cede_to_tick;
1955 # now do the right thing for maps 2227 # now do the right thing for maps
1956 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
1957 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
1961 unless ($self->{deny_activate}) { 2233 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2234 $self->decay_objects;
1963 $self->fix_auto_apply; 2235 $self->fix_auto_apply;
1964 $self->update_buttons; 2236 $self->update_buttons;
1965 cf::cede_to_tick; 2237 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2238 $self->activate;
1969 } 2239 }
1970 2240
1971 $self->{last_save} = $cf::RUNTIME; 2241 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2242 $self->last_access ($cf::RUNTIME);
1973 2243
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2244 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2245 }
1976 2246
1977 $self->post_load; 2247 $self->post_load;
1978}
1979 2248
2249 1
2250}
2251
2252# customize the map for a given player, i.e.
2253# return the _real_ map. used by e.g. per-player
2254# maps to change the path to ~playername/mappath
1980sub customise_for { 2255sub customise_for {
1981 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
1982 2257
1983 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2259 if $self->per_player;
2000 or next; 2275 or next;
2001 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
2002 or next; 2277 or next;
2003 $neigh->load; 2278 $neigh->load;
2004 2279
2280 # now find the diagonal neighbours
2005 push @neigh, 2281 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2284 }
2009 2285
2016} 2292}
2017 2293
2018sub find_sync { 2294sub find_sync {
2019 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
2020 2296
2021 cf::sync_job { find $path, $origin } 2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main;
2299
2300 find $path, $origin
2022} 2301}
2023 2302
2024sub do_load_sync { 2303sub do_load_sync {
2025 my ($map) = @_; 2304 my ($map) = @_;
2026 2305
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2307 if $Coro::current == $Coro::main;
2029 2308
2030 cf::sync_job { $map->load }; 2309 $map->load;
2031} 2310}
2032 2311
2033our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
2035 2314
2036sub find_async { 2315sub find_async {
2037 my ($path, $origin, $load) = @_; 2316 my ($path, $origin, $load) = @_;
2038 2317
2039 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
2040 2319
2041 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2322 }
2044 2323
2045 $MAP_PREFETCH{$path} |= $load; 2324 $MAP_PREFETCH{$path} |= $load;
2046 2325
2047 $MAP_PREFETCHER ||= cf::async { 2326 $MAP_PREFETCHER ||= cf::async {
2327 $Coro::current->{desc} = "map prefetcher";
2328
2048 while (%MAP_PREFETCH) { 2329 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2330 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2331 if (my $map = find $k) {
2051 $map->load if $v; 2332 $map->load if $v;
2052 } 2333 }
2059 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
2060 2341
2061 () 2342 ()
2062} 2343}
2063 2344
2345# common code, used by both ->save and ->swapout
2064sub save { 2346sub _save {
2065 my ($self) = @_; 2347 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2348
2069 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
2070 2350
2071 return unless $self->dirty; 2351 return unless $self->dirty;
2072 2352
2078 return if $self->{deny_save}; 2358 return if $self->{deny_save};
2079 2359
2080 local $self->{last_access} = $self->last_access;#d# 2360 local $self->{last_access} = $self->last_access;#d#
2081 2361
2082 cf::async { 2362 cf::async {
2363 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2364 $_->contr->save for $self->players;
2084 }; 2365 };
2366
2367 cf::get_slot 0.02;
2085 2368
2086 if ($uniq) { 2369 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2370 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2371 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2372 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2373 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2374 }
2092} 2375}
2093 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
2094sub swap_out { 2385sub swap_out {
2095 my ($self) = @_; 2386 my ($self) = @_;
2096 2387
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2389
2390 return if $self->in_memory != cf::MAP_ACTIVE;
2391 return if $self->{deny_save};
2102 return if $self->players; 2392 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2393
2394 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2397 $self->in_memory (cf::MAP_SWAPPED);
2398
2399 # then atomically save
2400 $self->_save;
2401
2402 # then free the map
2403 $self->clear;
2404}
2405
2406sub reset_at {
2407 my ($self) = @_;
2408
2409 # TODO: safety, remove and allow resettable per-player maps
2410 return 1e99 if $self->{deny_reset};
2411
2412 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2413 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2414
2415 $time + $to
2416}
2417
2418sub should_reset {
2419 my ($self) = @_;
2420
2421 $self->reset_at <= $cf::RUNTIME
2422}
2423
2424sub reset {
2425 my ($self) = @_;
2426
2427 my $lock = cf::lock_acquire "map_data:$self->{path}";
2428
2429 return if $self->players;
2430
2431 cf::trace "resetting map ", $self->path, "\n";
2432
2433 $self->in_memory (cf::MAP_SWAPPED);
2434
2435 # need to save uniques path
2436 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438
2439 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2440 if $uniq;
2441 }
2442
2443 delete $cf::MAP{$self->path};
2107 2444
2108 $self->deactivate; 2445 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2446 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2447 $self->clear;
2111}
2112
2113sub reset_at {
2114 my ($self) = @_;
2115
2116 # TODO: safety, remove and allow resettable per-player maps
2117 return 1e99 if $self->{deny_reset};
2118
2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2121
2122 $time + $to
2123}
2124
2125sub should_reset {
2126 my ($self) = @_;
2127
2128 $self->reset_at <= $cf::RUNTIME
2129}
2130
2131sub reset {
2132 my ($self) = @_;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135
2136 return if $self->players;
2137
2138 warn "resetting map ", $self->path;
2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 # need to save uniques path
2143 unless ($self->{deny_save}) {
2144 my $uniq = $self->uniq_path; utf8::encode $uniq;
2145
2146 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2147 if $uniq;
2148 }
2149
2150 delete $cf::MAP{$self->path};
2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2154 $self->clear;
2155 2448
2156 $self->unlink_save; 2449 $self->unlink_save;
2157 $self->destroy; 2450 $self->destroy;
2158} 2451}
2159 2452
2167 2460
2168 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
2169 2462
2170 $self->unlink_save; 2463 $self->unlink_save;
2171 2464
2172 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2470
2226 2519
2227sub unique_maps() { 2520sub unique_maps() {
2228 [ 2521 [
2229 map { 2522 map {
2230 utf8::decode $_; 2523 utf8::decode $_;
2231 /\.map$/ 2524 s/\.map$//; # TODO future compatibility hack
2525 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2526 ? ()
2232 ? normalise $_ 2527 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2528 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2529 ]
2236} 2530}
2237 2531
2238package cf; 2532=item cf::map::static_maps
2533
2534Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2535file in the shared directory excluding F</styles> and F</editor>). May
2536block.
2537
2538=cut
2539
2540sub static_maps() {
2541 my @dirs = "";
2542 my @maps;
2543
2544 while (@dirs) {
2545 my $dir = shift @dirs;
2546
2547 next if $dir eq "/styles" || $dir eq "/editor";
2548
2549 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2550 or return;
2551
2552 for (@$files) {
2553 s/\.map$// or next;
2554 utf8::decode $_;
2555 push @maps, "$dir/$_";
2556 }
2557
2558 push @dirs, map "$dir/$_", @$dirs;
2559 }
2560
2561 \@maps
2562}
2239 2563
2240=back 2564=back
2241 2565
2242=head3 cf::object 2566=head3 cf::object
2243 2567
2247 2571
2248=over 4 2572=over 4
2249 2573
2250=item $ob->inv_recursive 2574=item $ob->inv_recursive
2251 2575
2252Returns the inventory of the object _and_ their inventories, recursively. 2576Returns the inventory of the object I<and> their inventories, recursively,
2577but I<not> the object itself.
2253 2578
2254=cut 2579=cut
2255 2580
2256sub inv_recursive_; 2581sub inv_recursive_;
2257sub inv_recursive_ { 2582sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2587 inv_recursive_ inv $_[0]
2263} 2588}
2264 2589
2265=item $ref = $ob->ref 2590=item $ref = $ob->ref
2266 2591
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2592Creates and returns a persistent reference to an object that can be stored as a string.
2268 2593
2269=item $ob = cf::object::deref ($refstring) 2594=item $ob = cf::object::deref ($refstring)
2270 2595
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2596returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2597even if the object actually exists. May block.
2274=cut 2599=cut
2275 2600
2276sub deref { 2601sub deref {
2277 my ($ref) = @_; 2602 my ($ref) = @_;
2278 2603
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2604 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2605 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2606 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2607 or return;
2286 $pl->ob->uuid eq $uuid 2608 $pl->ob->uuid eq $uuid
2287 or return; 2609 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2629can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2630dialogue with the given NPC character.
2309 2631
2310=cut 2632=cut
2311 2633
2634our $SAY_CHANNEL = {
2635 id => "say",
2636 title => "Map",
2637 reply => "say ",
2638 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2639};
2640
2641our $CHAT_CHANNEL = {
2642 id => "chat",
2643 title => "Chat",
2644 reply => "chat ",
2645 tooltip => "Player chat and shouts, global to the server.",
2646};
2647
2312# rough implementation of a future "reply" method that works 2648# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2649# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2650#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2651sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2652 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2663 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2664 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2665
2330 } else { 2666 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2667 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2668 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2669 }
2334 } 2670 }
2335} 2671}
2336 2672
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2673=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2698
2363=item $player_object->enter_link 2699=item $player_object->enter_link
2364 2700
2365Freezes the player and moves him/her to a special map (C<{link}>). 2701Freezes the player and moves him/her to a special map (C<{link}>).
2366 2702
2367The player should be reasonably safe there for short amounts of time. You 2703The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2704for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2705though, as the player cannot control the character while it is on the link
2706map.
2369 2707
2370Will never block. 2708Will never block.
2371 2709
2372=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
2373 2711
2393sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
2394 my ($self) = @_; 2732 my ($self) = @_;
2395 2733
2396 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
2397 2735
2736 ++$self->{_link_recursion};
2737
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2739
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
2402 2742
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2744}
2405 2745
2406sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
2408 2748
2425 ($x, $y) = (-1, -1) 2765 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2766 unless (defined $x) && (defined $y);
2427 2767
2428 # use -1 or undef as default coordinates, not 0, 0 2768 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2769 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2770 if $x <= 0 && $y <= 0;
2431 2771
2432 $map->load; 2772 $map->load;
2433 $map->load_neighbours; 2773 $map->load_neighbours;
2434 2774
2435 return unless $self->contr->active; 2775 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2776
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2440} 2779 # entering was successful
2780 delete $self->{_link_recursion};
2781 # only activate afterwards, to support waiting in hooks
2782 $self->activate_recursive;
2783 }
2441 2784
2785}
2786
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2787=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2788
2444Moves the player to the given map-path and coordinates by first freezing 2789Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2791that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2792the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2793be called at the end of this process.
2449 2794
2795Note that $check will be called with a potentially non-loaded map, so if
2796it needs a loaded map it has to call C<< ->load >>.
2797
2450=cut 2798=cut
2451 2799
2452our $GOTOGEN; 2800our $GOTOGEN;
2453 2801
2454sub cf::object::player::goto { 2802sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2803 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2804
2805 if ($self->{_link_recursion} >= $MAX_LINKS) {
2806 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2807 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2808 ($path, $x, $y) = @$EMERGENCY_POSITION;
2809 }
2810
2457 # do generation counting so two concurrent goto's will be executed in-order 2811 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2813
2460 $self->enter_link; 2814 $self->enter_link;
2461 2815
2462 (async { 2816 (async {
2817 $Coro::current->{desc} = "player::goto $path $x $y";
2818
2463 # *tag paths override both path and x|y 2819 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2820 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2821 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2822 my $ob = $obs[rand @obs];
2467 2823
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2824 # see if we actually can go there
2469 # for suitability. 2825 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2826 $ob = $obs[rand @obs];
2827 } else {
2828 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2829 }
2830 # else put us there anyways for now #d#
2470 2831
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2832 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2833 } else {
2834 ($path, $x, $y) = (undef, undef, undef);
2472 } 2835 }
2473 } 2836 }
2474 2837
2475 my $map = eval { 2838 my $map = eval {
2476 my $map = cf::map::find $path; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2477 2840
2478 if ($map) { 2841 if ($map) {
2479 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2481 } else { 2844 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2845 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2846 }
2484 2847
2485 $map 2848 $map
2486 }; 2849 };
2487 2850
2493 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2495 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2496 } 2859 }
2497 2860
2498 $done->() if $done; 2861 $done->($self) if $done;
2499 })->prio (1); 2862 })->prio (1);
2500} 2863}
2501 2864
2502=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2503 2866
2523} 2886}
2524 2887
2525sub prepare_random_map { 2888sub prepare_random_map {
2526 my ($exit) = @_; 2889 my ($exit) = @_;
2527 2890
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2891 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2892 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2893 # that depends on the exit object
2533 2894
2534 my $rmp = parse_random_map_params $exit->msg; 2895 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2897 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2898 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2899 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2900 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2901 $rmp->{origin_y} = $exit->y;
2902
2903 $exit->map->touch;
2541 } 2904 }
2542 2905
2543 $rmp->{random_seed} ||= $exit->random_seed; 2906 $rmp->{random_seed} ||= $exit->random_seed;
2544 2907
2545 my $data = cf::to_json $rmp; 2908 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2909 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2910 my $meta = "$RANDOMDIR/$md5.meta";
2548 2911
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2912 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2913 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2914 undef $fh;
2552 aio_rename "$meta~", $meta; 2915 aio_rename "$meta~", $meta;
2553 2916
2917 my $slaying = "?random/$md5";
2918
2919 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2920 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2921 $exit->msg (undef);
2922 }
2556 } 2923 }
2557} 2924}
2558 2925
2559sub cf::object::player::enter_exit { 2926sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2927 my ($self, $exit) = @_;
2561 2928
2562 return unless $self->type == cf::PLAYER; 2929 return unless $self->type == cf::PLAYER;
2563 2930
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; 2931 $self->enter_link;
2576 2932
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 { 2933 (async {
2582 $self->deactivate_recursive; # just to be sure 2934 $Coro::current->{desc} = "enter_exit";
2935
2583 unless (eval { 2936 unless (eval {
2937 $self->deactivate_recursive; # just to be sure
2938
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp;
2950
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
3462our $stat_fh; 4117sub tick {
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3465$TICK_WATCHER = Event->timer (
3466 reentrant => 0,
3467 parked => 1,
3468 prio => 0,
3469 at => $NEXT_TICK || $TICK,
3470 data => WF_AUTOCANCEL,
3471 cb => sub {
3472 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
3473 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"
3474 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
3475 return; 4121 return;
3476 } 4122 }
3477 4123
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3480 $NOW = $tick_start = Event::time;
3481
3482 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3483 4125
3484 $RUNTIME += $TICK; 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3485 $NEXT_TICK += $TICK;
3486 4127
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3489 Coro::async_pool { 4130 Coro::async_pool {
4131 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 4132 write_runtime_sync
3491 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3492 };
3493 } 4134 };
4135 }
3494 4136
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 4138 $sig->send;
3500 } 4139 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 4141 $sig->send;
3503 } 4142 }
3504 4143
3505 $NOW = Event::time; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 4146
3516 _post_tick; 4147 if (0) {
3517 4148 if ($NEXT_TICK) {
3518 # gather some statistics#d# 4149 my $jitter = $TICK_START - $NEXT_TICK;
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 4151 debug "jitter $JITTER\n";#d#
4152 }
3521 }, 4153 }
3522); 4154}
3523 4155
3524{ 4156{
4157 # configure BDB
4158
3525 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3526 BDB::max_poll_time $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3527 $BDB_POLL_WATCHER = Event->io ( 4161 $AnyEvent::BDB::WATCHER->priority (1);
3528 reentrant => 0,
3529 fd => BDB::poll_fileno,
3530 poll => 'r',
3531 prio => 0,
3532 data => WF_AUTOCANCEL,
3533 cb => \&BDB::poll_cb,
3534 );
3535
3536 BDB::set_sync_prepare {
3537 my $status;
3538 my $current = $Coro::current;
3539 (
3540 sub {
3541 $status = $!;
3542 $current->ready; undef $current;
3543 },
3544 sub {
3545 Coro::schedule while defined $current;
3546 $! = $status;
3547 },
3548 )
3549 };
3550 4162
3551 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3552 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
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;
4168 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4169 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4170
3554 cf::sync_job { 4171 cf::sync_job {
3555 eval { 4172 eval {
3556 BDB::db_env_open 4173 BDB::db_env_open
3557 $DB_ENV, 4174 $DB_ENV,
3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4176 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4177 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 4178 0666;
3562 4179
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4180 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 4181 };
3569 4182
3570 cf::cleanup "db_env_open(db): $@" if $@; 4183 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 4184 };
3572 } 4185 }
3573 4186
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4187 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3575 after => 11, 4188 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3576 interval => 60, 4189 };
3577 hard => 1, 4190 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 ); 4192 };
3584 $BDB_TRICKLE_WATCHER = Event->timer ( 4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 ); 4195 };
3594} 4196}
3595 4197
3596{ 4198{
4199 # configure IO::AIO
4200
3597 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3598
3599 undef $Coro::AIO::WATCHER;
3600 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3601 $AIO_POLL_WATCHER = Event->io ( 4203 undef $AnyEvent::AIO::WATCHER;
3602 reentrant => 0,
3603 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno,
3605 poll => 'r',
3606 prio => 6,
3607 cb => \&IO::AIO::poll_cb,
3608 );
3609} 4204}
3610 4205
3611my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3612 4208
3613sub _log_backtrace { 4209sub _log_backtrace {
3614 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3615 4211
3616 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3617 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3618 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3620 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3621 async { 4222 async {
4223 $Coro::current->{desc} = "abt $msg";
4224
3622 my @bt = fork_call { 4225 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4227 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 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 |"
3626 or die "addr2line: $!"; 4229 or die "addr2line: $!";
3634 } 4237 }
3635 4238
3636 @funcs 4239 @funcs
3637 }; 4240 };
3638 4241
3639 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3640 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3641 --$_log_backtrace; 4245 --$_log_backtrace;
3642 }; 4246 };
3643 } else { 4247 } else {
3644 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3645 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3646 } 4250 }
3647} 4251}
3648 4252
3649# load additional modules 4253# load additional modules
3650use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3651 4256
3652END { cf::emergency_save } 4257END { cf::emergency_save }
3653 4258
36541 42591
3655 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines