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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
83 125
84our $BDB_POLL_WATCHER; 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 #
1709 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1710 $path = "$base/$path"; 1968 $path = "$base/$path";
1711 } 1969 }
1712 1970
1713 for ($path) { 1971 for ($path) {
1714 redo if s{//}{/};
1715 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1716 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1717 } 1974 }
1718 1975
1719 $path 1976 $path
1733 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1734 return $self; 1991 return $self;
1735 } 1992 }
1736 } 1993 }
1737 1994
1738 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1739 () 1996 ()
1740} 1997}
1741 1998
1999# may re-bless or do other evil things
1742sub init { 2000sub init {
1743 my ($self) = @_; 2001 my ($self) = @_;
1744 2002
1745 $self 2003 $self
1746} 2004}
1765 2023
1766# the temporary/swap location 2024# the temporary/swap location
1767sub save_path { 2025sub save_path {
1768 my ($self) = @_; 2026 my ($self) = @_;
1769 2027
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1772} 2030}
1773 2031
1774# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1775sub uniq_path { 2033sub uniq_path {
1776 my ($self) = @_; 2034 my ($self) = @_;
1777 2035
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 2038}
1790 2039
1791sub decay_objects { 2040sub decay_objects {
1792 my ($self) = @_; 2041 my ($self) = @_;
1793 2042
1820 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1821 2070
1822 1 2071 1
1823} 2072}
1824 2073
2074# used to laod the header of an original map
1825sub load_header_orig { 2075sub load_header_orig {
1826 my ($self) = @_; 2076 my ($self) = @_;
1827 2077
1828 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1829} 2079}
1830 2080
2081# used to laod the header of an instantiated map
1831sub load_header_temp { 2082sub load_header_temp {
1832 my ($self) = @_; 2083 my ($self) = @_;
1833 2084
1834 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1835} 2086}
1836 2087
2088# called after loading the header from an instantiated map
1837sub prepare_temp { 2089sub prepare_temp {
1838 my ($self) = @_; 2090 my ($self) = @_;
1839 2091
1840 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1841 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1842 # safety 2094 # safety
1843 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1844 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1845} 2097}
1846 2098
2099# called after loading the header from an original map
1847sub prepare_orig { 2100sub prepare_orig {
1848 my ($self) = @_; 2101 my ($self) = @_;
1849 2102
1850 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1851 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1875 2128
1876sub find; 2129sub find;
1877sub find { 2130sub find {
1878 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1879 2132
2133 cf::cede_to_tick;
2134
1880 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1881 2136
1882 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2139
1885 $cf::MAP{$path} || do { 2140 $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 2141 my $map = new_from_path cf::map $path
1890 or return; 2142 or return;
1891 2143
1892 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1893 2145
1895 or return; 2147 or return;
1896 2148
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
1900 undef $guard1; 2153 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2154 $map->reset;
1903 return find $path; 2155 return find $path;
1904 } 2156 }
1905 2157
1906 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1907 } 2159 }
1908} 2160}
1909 2161
1910sub pre_load { } 2162sub pre_load { }
1911sub post_load { } 2163#sub post_load { } # XS
1912 2164
1913sub load { 2165sub load {
1914 my ($self) = @_; 2166 my ($self) = @_;
1915 2167
1916 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1928 $self->alloc; 2180 $self->alloc;
1929 2181
1930 $self->pre_load; 2182 $self->pre_load;
1931 cf::cede_to_tick; 2183 cf::cede_to_tick;
1932 2184
2185 if (exists $self->{load_path}) {
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2187 $f->skip_block;
1935 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
1936 or return; 2189 or return;
1937 2190
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2191 $self->post_load_original
1939 if delete $self->{load_original}; 2192 if delete $self->{load_original};
1940 2193
1941 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2195 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
1945 $self->clear_unique_items; 2198 $self->clear_unique_items;
1946 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
1948 } 2202 }
1949 } 2203 }
1950 }
1951 2204
1952 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
1953 2210
1954 cf::cede_to_tick; 2211 cf::cede_to_tick;
1955 # now do the right thing for maps 2212 # now do the right thing for maps
1956 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
1957 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
1961 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2219 $self->decay_objects;
1963 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
1964 $self->update_buttons; 2221 $self->update_buttons;
1965 cf::cede_to_tick; 2222 cf::cede_to_tick;
1966 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
1967 cf::cede_to_tick;
1968 $self->activate;
1969 } 2224 }
1970 2225
1971 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
1973 2228
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2229 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2230 }
1976 2231
1977 $self->post_load; 2232 $self->post_load;
1978}
1979 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
1980sub customise_for { 2240sub customise_for {
1981 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
1982 2242
1983 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2244 if $self->per_player;
2000 or next; 2260 or next;
2001 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2002 or next; 2262 or next;
2003 $neigh->load; 2263 $neigh->load;
2004 2264
2265 # now find the diagonal neighbours
2005 push @neigh, 2266 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2269 }
2009 2270
2016} 2277}
2017 2278
2018sub find_sync { 2279sub find_sync {
2019 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2020 2281
2021 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2022} 2286}
2023 2287
2024sub do_load_sync { 2288sub do_load_sync {
2025 my ($map) = @_; 2289 my ($map) = @_;
2026 2290
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2029 2293
2030 cf::sync_job { $map->load }; 2294 $map->load;
2031} 2295}
2032 2296
2033our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2035 2299
2036sub find_async { 2300sub find_async {
2037 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2038 2302
2039 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2040 2304
2041 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2307 }
2044 2308
2045 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2046 2310
2047 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2312 $Coro::current->{desc} = "map prefetcher";
2313
2048 while (%MAP_PREFETCH) { 2314 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2315 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2316 if (my $map = find $k) {
2051 $map->load if $v; 2317 $map->load if $v;
2052 } 2318 }
2059 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2060 2326
2061 () 2327 ()
2062} 2328}
2063 2329
2330# common code, used by both ->save and ->swapout
2064sub save { 2331sub _save {
2065 my ($self) = @_; 2332 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2333
2069 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2070 2335
2071 return unless $self->dirty; 2336 return unless $self->dirty;
2072 2337
2078 return if $self->{deny_save}; 2343 return if $self->{deny_save};
2079 2344
2080 local $self->{last_access} = $self->last_access;#d# 2345 local $self->{last_access} = $self->last_access;#d#
2081 2346
2082 cf::async { 2347 cf::async {
2348 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
2084 }; 2350 };
2351
2352 cf::get_slot 0.02;
2085 2353
2086 if ($uniq) { 2354 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2357 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2359 }
2092} 2360}
2093 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2094sub swap_out { 2370sub swap_out {
2095 my ($self) = @_; 2371 my ($self) = @_;
2096 2372
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2374
2375 return if $self->in_memory != cf::MAP_ACTIVE;
2376 return if $self->{deny_save};
2102 return if $self->players; 2377 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2107 2429
2108 $self->deactivate; 2430 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2432 $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 2433
2156 $self->unlink_save; 2434 $self->unlink_save;
2157 $self->destroy; 2435 $self->destroy;
2158} 2436}
2159 2437
2167 2445
2168 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2169 2447
2170 $self->unlink_save; 2448 $self->unlink_save;
2171 2449
2172 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2455
2226 2504
2227sub unique_maps() { 2505sub unique_maps() {
2228 [ 2506 [
2229 map { 2507 map {
2230 utf8::decode $_; 2508 utf8::decode $_;
2231 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2232 ? normalise $_ 2512 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2514 ]
2236} 2515}
2237 2516
2238package cf; 2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2239 2548
2240=back 2549=back
2241 2550
2242=head3 cf::object 2551=head3 cf::object
2243 2552
2247 2556
2248=over 4 2557=over 4
2249 2558
2250=item $ob->inv_recursive 2559=item $ob->inv_recursive
2251 2560
2252Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2253 2563
2254=cut 2564=cut
2255 2565
2256sub inv_recursive_; 2566sub inv_recursive_;
2257sub inv_recursive_ { 2567sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2263} 2573}
2264 2574
2265=item $ref = $ob->ref 2575=item $ref = $ob->ref
2266 2576
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2577Creates and returns a persistent reference to an object that can be stored as a string.
2268 2578
2269=item $ob = cf::object::deref ($refstring) 2579=item $ob = cf::object::deref ($refstring)
2270 2580
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2582even if the object actually exists. May block.
2274=cut 2584=cut
2275 2585
2276sub deref { 2586sub deref {
2277 my ($ref) = @_; 2587 my ($ref) = @_;
2278 2588
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2589 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2590 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2591 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2592 or return;
2286 $pl->ob->uuid eq $uuid 2593 $pl->ob->uuid eq $uuid
2287 or return; 2594 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2615dialogue with the given NPC character.
2309 2616
2310=cut 2617=cut
2311 2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2632
2312# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2634# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2637 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2650
2330 } else { 2651 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2654 }
2334 } 2655 }
2335} 2656}
2336 2657
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2683
2363=item $player_object->enter_link 2684=item $player_object->enter_link
2364 2685
2365Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2366 2687
2367The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2369 2692
2370Will never block. 2693Will never block.
2371 2694
2372=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2373 2696
2393sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2394 my ($self) = @_; 2717 my ($self) = @_;
2395 2718
2396 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2397 2720
2721 ++$self->{_link_recursion};
2722
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2724
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2402 2727
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2729}
2405 2730
2406sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2408 2733
2425 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2427 2752
2428 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2431 2756
2432 $map->load; 2757 $map->load;
2433 $map->load_neighbours; 2758 $map->load_neighbours;
2434 2759
2435 return unless $self->contr->active; 2760 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2761
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2440} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2441 2769
2770}
2771
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2773
2444Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2778be called at the end of this process.
2449 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2450=cut 2783=cut
2451 2784
2452our $GOTOGEN; 2785our $GOTOGEN;
2453 2786
2454sub cf::object::player::goto { 2787sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2795
2457 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2798
2460 $self->enter_link; 2799 $self->enter_link;
2461 2800
2462 (async { 2801 (async {
2802 $Coro::current->{desc} = "player::goto $path $x $y";
2803
2463 # *tag paths override both path and x|y 2804 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2805 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2806 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2807 my $ob = $obs[rand @obs];
2467 2808
2478 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2479 } 2820 }
2480 } 2821 }
2481 2822
2482 my $map = eval { 2823 my $map = eval {
2483 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2484 2825
2485 if ($map) { 2826 if ($map) {
2486 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2487 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2488 } else { 2829 } else {
2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2490 } 2831 }
2491 2832
2492 $map 2833 $map
2500 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2501 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2502 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2503 } 2844 }
2504 2845
2505 $done->() if $done; 2846 $done->($self) if $done;
2506 })->prio (1); 2847 })->prio (1);
2507} 2848}
2508 2849
2509=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2510 2851
2530} 2871}
2531 2872
2532sub prepare_random_map { 2873sub prepare_random_map {
2533 my ($exit) = @_; 2874 my ($exit) = @_;
2534 2875
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2878 # that depends on the exit object
2540 2879
2541 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2882 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2548 } 2889 }
2549 2890
2550 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2551 2892
2552 my $data = cf::to_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2555 2896
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2899 undef $fh;
2559 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2560 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2563 } 2908 }
2564} 2909}
2565 2910
2566sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2568 2913
2569 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2570 2915
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2916 $self->enter_link;
2583 2917
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2918 (async {
2589 $self->deactivate_recursive; # just to be sure 2919 $Coro::current->{desc} = "enter_exit";
2920
2590 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2948
2591 $self->goto ($slaying, $hp, $sp); 2949 $self->goto ($map, $x, $y);
2592 2950
2951 # if exit is damned, update players death & WoR home-position
2952 $self->contr->savebed ($map, $x, $y)
2953 if $exit->flag (cf::FLAG_DAMNED);
2954
2593 1; 2955 1
2594 }) { 2956 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2961
2600 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2601 $self->leave_link; 2963 $self->leave_link;
2602 } 2964 }
2603 })->prio (1); 2965 })->prio (1);
2604} 2966}
2605 2967
2617sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2619 2981
2620 utf8::encode $text; 2982 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2984}
2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
2622} 3009}
2623 3010
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 3012
2626Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2628the message, with C<log> being the default. If C<$color> is negative, suppress 3015the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 3016the message unless the client supports the msg packet.
2630 3017
2631=cut 3018=cut
2632 3019
3020# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
2634 "c/identify" => { 3028 "c/identify" => {
2635 id => "identify", 3029 id => "infobox",
2636 title => "Identify", 3030 title => "Identify",
2637 reply => undef, 3031 reply => undef,
2638 tooltip => "Items recently identified", 3032 tooltip => "Items recently identified",
2639 }, 3033 },
2640 "c/examine" => { 3034 "c/examine" => {
2641 id => "examine", 3035 id => "infobox",
2642 title => "Examine", 3036 title => "Examine",
2643 reply => undef, 3037 reply => undef,
2644 tooltip => "Signs and other items you examined", 3038 tooltip => "Signs and other items you examined",
2645 }, 3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
3045 },
3046 "c/book" => {
3047 id => "infobox",
3048 title => "Book",
3049 reply => undef,
3050 tooltip => "The contents of a note or book",
3051 },
3052 "c/lookat" => {
3053 id => "infobox",
3054 title => "Look",
3055 reply => undef,
3056 tooltip => "What you saw there",
3057 },
3058 "c/who" => {
3059 id => "infobox",
3060 title => "Players",
3061 reply => undef,
3062 tooltip => "Shows players who are currently online",
3063 },
3064 "c/body" => {
3065 id => "infobox",
3066 title => "Body Parts",
3067 reply => undef,
3068 tooltip => "Shows which body parts you posess and are available",
3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
3076 "c/skills" => {
3077 id => "infobox",
3078 title => "Skills",
3079 reply => undef,
3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
3105 },
3106 "c/uptime" => {
3107 id => "infobox",
3108 title => "Uptime",
3109 reply => undef,
3110 tooltip => "How long the server has been running since last restart",
3111 },
3112 "c/mapinfo" => {
3113 id => "infobox",
3114 title => "Map Info",
3115 reply => undef,
3116 tooltip => "Information related to the maps",
3117 },
3118 "c/party" => {
3119 id => "party",
3120 title => "Party",
3121 reply => "gsay ",
3122 tooltip => "Messages and chat related to your party",
3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
2646); 3132);
2647 3133
2648sub cf::client::send_msg { 3134sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2650 3136
2651 $msg = $self->pl->expand_cfpod ($msg); 3137 $msg = $self->pl->expand_cfpod ($msg)
3138 unless $color & cf::NDI_VERBATIM;
2652 3139
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 3140 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 3141
2655 # check predefined channels, for the benefit of C 3142 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3143 if ($CHANNEL{$channel}) {
3144 $channel = $CHANNEL{$channel};
2657 3145
3146 $self->ext_msg (channel_info => $channel);
3147 $channel = $channel->{id};
3148
2658 if (ref $channel) { 3149 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 3153 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 3154 }
2665 3155
2666 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2667 } 3157 }
2668 3158
2669 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2670 3160
2671 if ($self->can_msg) {
2672 # default colour, mask it out 3161 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 3163 if $color & cf::NDI_DEF;
2675 3164
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3165 my $pkt = "msg "
3166 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 3168 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 3169
2690 $color &= cf::NDI_COLOR_MASK; 3170 $self->send_big_packet ($pkt);
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703} 3171}
2704 3172
2705=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2706 3174
2707Sends an ext event to the client. 3175Sends an ext event to the client.
2710 3178
2711sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2713 3181
2714 if ($self->extcmd == 2) { 3182 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 } 3187 }
2720} 3188}
2721 3189
2722=item $client->ext_reply ($msgid, @msg) 3190=item $client->ext_reply ($msgid, @msg)
2723 3191
2727 3195
2728sub cf::client::ext_reply($$@) { 3196sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_; 3197 my ($self, $id, @msg) = @_;
2730 3198
2731 if ($self->extcmd == 2) { 3199 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) { 3201 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove 3202 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id; 3203 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 } 3205 }
2738} 3206}
2739 3207
2740=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2741 3209
2812 3280
2813 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
2814 if $reply; 3282 if $reply;
2815 3283
2816 } else { 3284 } else {
2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2818 } 3286 }
2819 3287
2820 cf::override; 3288 cf::override;
2821 }, 3289 },
2822); 3290);
2842 3310
2843 $coro 3311 $coro
2844} 3312}
2845 3313
2846cf::client->attach ( 3314cf::client->attach (
2847 on_destroy => sub { 3315 on_client_destroy => sub {
2848 my ($ns) = @_; 3316 my ($ns) = @_;
2849 3317
2850 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2851 }, 3319 },
2852); 3320);
2868our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
2869 3337
2870$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
2871 3339
2872$safe->permit_only (Opcode::opset qw( 3340$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math 3341 :base_core :base_mem :base_orig :base_math :base_loop
2874 grepstart grepwhile mapstart mapwhile 3342 grepstart grepwhile mapstart mapwhile
2875 sort time 3343 sort time
2876)); 3344));
2877 3345
2878# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
2880=pod 3348=pod
2881 3349
2882The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
2883 3351
2884 cf::object 3352 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3353 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3354 insert remove name archname title slaying race decrease split
3355 value
2887 3356
2888 cf::object::player 3357 cf::object::player
2889 player 3358 player
2890 3359
2891 cf::player 3360 cf::player
2896 3365
2897=cut 3366=cut
2898 3367
2899for ( 3368for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3370 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3371 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
2906) { 3375) {
2907 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2910 for @funs; 3378 for @funs;
2911} 3379}
2912 3380
2927 3395
2928 my $qcode = $code; 3396 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
2931 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
2932 local $_; 3403 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars;
2934 3404
2935 my $eval = 3405 my $eval =
2936 "do {\n" 3406 "do {\n"
2937 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2938 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
2939 . $code 3409 . $code
2940 . "\n}" 3410 . "\n}"
2941 ; 3411 ;
2942 3412
3413 if ($CFG{safe_eval}) {
2943 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
2944 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2945 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
2946 3422
2947 if ($@) { 3423 if ($@) {
2948 warn "$@"; 3424 warn "$@",
2949 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
2950 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
2951 } 3427 }
2952 3428
2953 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
2954} 3430}
2955 3431
2969=cut 3445=cut
2970 3446
2971sub register_script_function { 3447sub register_script_function {
2972 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
2973 3449
2974 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
2975 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
2976} 3452}
2977 3453
2978=back 3454=back
2979 3455
2980=cut 3456=cut
2989 # for this (global event?) 3465 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
2991 3467
2992 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2993 3469
2994 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
2995 3471
2996 my $facedata; 3472 my $facedata = decode_storable load_file $path;
2997 0 < aio_load $path, $facedata
2998 or die "$path: $!";
2999
3000 $facedata = Coro::Storable::thaw $facedata;
3001 3473
3002 $facedata->{version} == 2 3474 $facedata->{version} == 2
3003 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004 3476
3005 # patch in the exptable 3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3006 $facedata->{resource}{"res/exp_table"} = { 3479 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC, 3480 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3009 }; 3483 };
3010 cf::cede_to_tick; 3484 cf::cede_to_tick;
3011 3485
3012 { 3486 {
3013 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
3014 3488
3015 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3491
3017 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3021 3497
3022 cf::cede_to_tick; 3498 cf::cede_to_tick;
3023 } 3499 }
3024 3500
3025 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3502 next unless $info->{smooth};
3503
3027 my $idx = cf::face::find $face 3504 my $idx = cf::face::find $face
3028 or next; 3505 or next;
3506
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3510 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3034 } 3512 }
3035 3513
3036 cf::cede_to_tick; 3514 cf::cede_to_tick;
3037 } 3515 }
3038 } 3516 }
3047 3525
3048 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
3049 } 3527 }
3050 3528
3051 { 3529 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
3055 3531
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
3533 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061 3535
3062 if ($info->{type} & 1) { 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3063 # prepend meta info 3537 cf::face::set_type $idx, $info->{type};
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else { 3538 } else {
3072 $data = $info->{data}; 3539 $RESOURCE{$name} = $info; # unused
3073 } 3540 }
3074 3541
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3542 cf::cede_to_tick;
3079 } 3543 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3544 }
3545
3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3547
3100 1 3548 1
3101} 3549}
3102 3550
3103register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3105 3553
3106 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3555 $ns->fx_want ($k, $v);
3108 } 3556 }
3109}; 3557};
3558
3559sub load_resource_file($) {
3560 my $guard = lock_acquire "load_resource_file";
3561
3562 my $status = load_resource_file_ $_[0];
3563 get_slot 0.1, 100;
3564 cf::arch::commit_load;
3565
3566 $status
3567}
3110 3568
3111sub reload_regions { 3569sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3570 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3571 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3572 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3586}
3129 3587
3130sub reload_archetypes { 3588sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3589 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3590 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3591}
3139 3592
3140sub reload_treasures { 3593sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3143} 3596}
3144 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3145sub reload_resources { 3618sub reload_resources {
3146 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3147 3620
3621 reload_exp_table;
3622 reload_materials;
3623 reload_facedata;
3624 reload_sound;
3625 reload_archetypes;
3148 reload_regions; 3626 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3627 reload_treasures;
3153 3628
3154 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3155}
3156
3157sub init {
3158 reload_resources;
3159} 3630}
3160 3631
3161sub reload_config { 3632sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3633 trace "reloading config file...\n";
3163 or return;
3164 3634
3165 local $/; 3635 my $config = load_file "$CONFDIR/config";
3166 *CFG = YAML::Syck::Load <$fh>; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3167 3638
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3169 3640
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3172 3643
3173 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
3177 }; 3648 };
3178 warn $@ if $@; 3649 warn $@ if $@;
3179 } 3650 }
3180} 3651}
3181 3652
3653sub pidfile() {
3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3655 or die "$PIDFILE: $!";
3656 flock $fh, &Fcntl::LOCK_EX
3657 or die "$PIDFILE: flock: $!";
3658 $fh
3659}
3660
3661# make sure only one server instance is running at any one time
3662sub atomic {
3663 my $fh = pidfile;
3664
3665 my $pid = <$fh>;
3666 kill 9, $pid if $pid > 0;
3667
3668 seek $fh, 0, 0;
3669 print $fh $$;
3670}
3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
3182sub main { 3681sub main {
3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3690
3183 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3694 (async {
3187 Event::one_event; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3696 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
3189 }; 3698 };
3190 3699
3700 evthread_start IO::AIO::poll_fileno;
3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3191 reload_config; 3712 reload_config;
3192 db_init; 3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
3193 load_extensions; 3723 load_extensions;
3194 3724
3195 $TICK_WATCHER->start; 3725 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3726
3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3730
3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
3197} 3743}
3198 3744
3199############################################################################# 3745#############################################################################
3200# initialisation and cleanup 3746# initialisation and cleanup
3201 3747
3202# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
3203BEGIN { 3749BEGIN {
3750 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
3212 },
3213 ); 3754 };
3214 } 3755 }
3215} 3756}
3216 3757
3217sub write_runtime { 3758sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3759 my $t0 = AE::time;
3219 3760
3220 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3222 3763
3223 IO::AIO::aio_utime $runtime, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3765
3225 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3226 3767
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3228 or return; 3769 or return;
3229 3770
3230 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3242 aio_utime $fh, undef, undef; 3783 aio_utime $fh, undef, undef;
3243 3784
3244 close $fh 3785 close $fh
3245 or return; 3786 or return;
3246 3787
3247 aio_rename "$runtime~", $runtime 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3789 and return;
3249 3790
3250 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3251 3792
3252 1 3793 1
3794}
3795
3796our $uuid_lock;
3797our $uuid_skip;
3798
3799sub write_uuid_sync($) {
3800 $uuid_skip ||= $_[0];
3801
3802 return if $uuid_lock;
3803 local $uuid_lock = 1;
3804
3805 my $uuid = "$LOCALDIR/uuid";
3806
3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3808 or return;
3809
3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3818 $uuid_skip = 0;
3819
3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3821 and return;
3822
3823 # always fsync - this file is important
3824 aio_fsync $fh
3825 and return;
3826
3827 close $fh
3828 or return;
3829
3830 aio_rename "$uuid~", $uuid
3831 and return;
3832
3833 trace "uuid file written ($value).\n";
3834
3835 1
3836
3837}
3838
3839sub write_uuid($$) {
3840 my ($skip, $sync) = @_;
3841
3842 $sync ? write_uuid_sync $skip
3843 : async { write_uuid_sync $skip };
3253} 3844}
3254 3845
3255sub emergency_save() { 3846sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3257 3848
3258 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3259 3855
3260 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3261 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3865 $pl->valid or next;
3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3867 $pl->save;
3269 } 3868 }
3270 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3271 3870
3272 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3876 $map->valid or next;
3276 $map->save; 3877 $map->save;
3277 } 3878 }
3278 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3279 3880
3280 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3886
3887 info "emergency_perl_save: begin write uuid\n";
3888 write_uuid_sync 1;
3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3283 }; 3909 };
3284 3910
3285 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3286} 3912}
3287 3913
3288sub post_cleanup { 3914sub post_cleanup {
3289 my ($make_core) = @_; 3915 my ($make_core) = @_;
3290 3916
3917 IO::AIO::flush;
3918
3291 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3920 if $make_core;
3921
3922 my $fh = pidfile;
3923 unlink $PIDFILE if <$fh> == $$;
3924}
3925
3926# a safer delete_package, copied from Symbol
3927sub clear_package($) {
3928 my $pkg = shift;
3929
3930 # expand to full symbol table name if needed
3931 unless ($pkg =~ /^main::.*::$/) {
3932 $pkg = "main$pkg" if $pkg =~ /^::/;
3933 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3934 $pkg .= '::' unless $pkg =~ /::$/;
3935 }
3936
3937 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3938 my $stem_symtab = *{$stem}{HASH};
3939
3940 defined $stem_symtab and exists $stem_symtab->{$leaf}
3941 or return;
3942
3943 # clear all symbols
3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3945 for my $name (keys %$leaf_symtab) {
3946 _gv_clear *{"$pkg$name"};
3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3948 }
3293} 3949}
3294 3950
3295sub do_reload_perl() { 3951sub do_reload_perl() {
3296 # can/must only be called in main 3952 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3298 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3299 return; 3955 return;
3300 } 3956 }
3301 3957
3302 warn "reloading..."; 3958 return if $RELOAD++;
3303 3959
3304 warn "entering sync_job"; 3960 my $t1 = AE::time;
3305 3961
3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3965
3966 trace "perl_reload: entering sync_job";
3967
3306 cf::sync_job { 3968 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark
3308 cf::emergency_save; 3969 #cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark
3310 3970
3311 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV;
3313
3314 # if anything goes wrong in here, we should simply crash as we already saved
3315
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate...";
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = (); 3973 %EXT_CORO = ();
3335 3974
3336 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3337 %COMMAND = (); 3976 %COMMAND = ();
3338 3977
3339 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3340 %EXTCMD = (); 3979 %EXTCMD = ();
3341 %EXTICMD = (); 3980 %EXTICMD = ();
3342 3981
3343 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3344 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3346 3985
3347 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3348 eval { 3987 eval {
3349 $cb->($pkg); 3988 $cb->($pkg);
3350 1 3989 1
3351 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3991 }
3992
3993 trace "... clearing $pkg";
3994 clear_package $pkg;
3352 } 3995 }
3353 3996
3354 warn "... nuking $pkg";
3355 Symbol::delete_package $pkg;
3356 }
3357
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3359 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 4000
3362 warn "... unloading $k"; 4001 trace "... unloading $k";
3363 delete $INC{$k}; 4002 delete $INC{$k};
3364 4003
3365 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3367 4006
3368 if (my $cb = $k->can ("unload_module")) { 4007 if (my $cb = $k->can ("unload_module")) {
3369 $cb->(); 4008 $cb->();
4009 }
4010
4011 clear_package $k;
3370 } 4012 }
3371 4013
3372 Symbol::delete_package $k;
3373 }
3374
3375 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 4015 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 4017
3379 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 4021
3383 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3384 # and global variables created in xs 4023 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3386 4025
3387 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3388 4027
3389 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3390 require cf; 4029 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3392 4031
3393 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3394 cf::reload_config; 4033 cf::reload_config;
3395 4034
3396 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3397 cf::load_extensions; 4036 cf::load_extensions;
3398 4037
4038 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3402 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3405 4046
3406 warn "leaving sync_job"; 4047 cf::_post_init 1;
3407 4048
4049 trace "perl_reload: leaving sync_job";
4050
3408 1 4051 1
3409 } or do { 4052 } or do {
3410 warn $@; 4053 error $@;
3411 warn "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3412 exit 1; 4055 };
4056
4057 --$RELOAD;
3413 }; 4058 }
3414 4059
3415 warn "reloaded"; 4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3416}; 4062};
3417 4063
3418our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3419 4065
3420sub reload_perl() { 4066sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3423 4069
3424 $RELOAD_WATCHER ||= Event->timer ( 4070 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 4071 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 4072
3427 data => WF_AUTOCANCEL, 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 4074 do_reload_perl;
3430 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
3431 }, 4076 };
3432 ); 4077 };
3433} 4078}
3434 4079
3435register_command "reload" => sub { 4080register_command "reload" => sub {
3436 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3437 4082
3438 if ($who->flag (FLAG_WIZ)) { 4083 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 4084 $who->message ("reloading server.");
4085 async {
4086 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 4087 reload_perl;
4088 };
3441 } 4089 }
3442}; 4090};
3443 4091
3444unshift @INC, $LIBDIR; 4092#############################################################################
3445 4093
3446my $bug_warning = 0; 4094my $bug_warning = 0;
3447 4095
3448our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3450 4098
3451sub wait_for_tick { 4099sub wait_for_tick() {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3454 4101
3455 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 4104 $signal->wait;
3458} 4105}
3459 4106
3460sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3463 4109
3464 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 4112 $signal->wait;
3467} 4113}
3468 4114
3469our $stat_fh; 4115sub tick {
3470sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471
3472$TICK_WATCHER = Event->timer (
3473 reentrant => 0,
3474 parked => 1,
3475 prio => 0,
3476 at => $NEXT_TICK || $TICK,
3477 data => WF_AUTOCANCEL,
3478 cb => sub {
3479 if ($Coro::current != $Coro::main) { 4116 if ($Coro::current != $Coro::main) {
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 4118 unless ++$bug_warning > 10;
3482 return; 4119 return;
3483 } 4120 }
3484 4121
3485 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487 $NOW = $tick_start = Event::time;
3488
3489 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3490 4123
3491 $RUNTIME += $TICK; 4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3492 $NEXT_TICK += $TICK;
3493 4125
3494 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3495 $NEXT_RUNTIME_WRITE = $NOW + 10; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3496 Coro::async_pool { 4128 Coro::async_pool {
4129 $Coro::current->{desc} = "runtime saver";
3497 write_runtime 4130 write_runtime_sync
3498 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3499 };
3500 } 4132 };
4133 }
3501 4134
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 4136 $sig->send;
3507 } 4137 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 4138 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 4139 $sig->send;
3510 } 4140 }
3511 4141
3512 $NOW = Event::time; 4142 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 4144
3523 _post_tick; 4145 if (0) {
3524 4146 if ($NEXT_TICK) {
3525 # gather some statistics#d# 4147 my $jitter = $TICK_START - $NEXT_TICK;
3526 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3527 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 4149 debug "jitter $JITTER\n";#d#
4150 }
3528 }, 4151 }
3529); 4152}
3530 4153
3531{ 4154{
4155 # configure BDB
4156
3532 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3533 BDB::max_poll_time $TICK * 0.1; 4158 BDB::max_poll_reqs $TICK * 0.1;
3534 $BDB_POLL_WATCHER = Event->io ( 4159 $AnyEvent::BDB::WATCHER->priority (1);
3535 reentrant => 0,
3536 fd => BDB::poll_fileno,
3537 poll => 'r',
3538 prio => 0,
3539 data => WF_AUTOCANCEL,
3540 cb => \&BDB::poll_cb,
3541 );
3542
3543 BDB::set_sync_prepare {
3544 my $status;
3545 my $current = $Coro::current;
3546 (
3547 sub {
3548 $status = $!;
3549 $current->ready; undef $current;
3550 },
3551 sub {
3552 Coro::schedule while defined $current;
3553 $! = $status;
3554 },
3555 )
3556 };
3557 4160
3558 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
4163 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4164 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4165 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4166 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4167 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 4168
3561 cf::sync_job { 4169 cf::sync_job {
3562 eval { 4170 eval {
3563 BDB::db_env_open 4171 BDB::db_env_open
3564 $DB_ENV, 4172 $DB_ENV,
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4174 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4175 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 4176 0666;
3569 4177
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4178 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573 | BDB::LOG_AUTOREMOVE, 1);
3574 $DB_ENV->set_lk_detect;
3575 }; 4179 };
3576 4180
3577 cf::cleanup "db_env_open(db): $@" if $@; 4181 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 4182 };
3579 } 4183 }
3580 4184
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4185 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3582 after => 11, 4186 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3583 interval => 60, 4187 };
3584 hard => 1, 4188 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3585 prio => 0,
3586 data => WF_AUTOCANCEL,
3587 cb => sub {
3588 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4189 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3589 },
3590 ); 4190 };
3591 $BDB_TRICKLE_WATCHER = Event->timer ( 4191 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3592 after => 5,
3593 interval => 10,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4192 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3599 },
3600 ); 4193 };
3601} 4194}
3602 4195
3603{ 4196{
4197 # configure IO::AIO
4198
3604 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3605
3606 undef $Coro::AIO::WATCHER;
3607 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3608 $AIO_POLL_WATCHER = Event->io ( 4201 undef $AnyEvent::AIO::WATCHER;
3609 reentrant => 0,
3610 data => WF_AUTOCANCEL,
3611 fd => IO::AIO::poll_fileno,
3612 poll => 'r',
3613 prio => 6,
3614 cb => \&IO::AIO::poll_cb,
3615 );
3616} 4202}
3617 4203
3618my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3619 4206
3620sub _log_backtrace { 4207sub _log_backtrace {
3621 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3622 4209
3623 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3624 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3625 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3626 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3627 ++$_log_backtrace; 4218 ++$_log_backtrace;
4219 my $perl_bt = Carp::longmess $msg;
3628 async { 4220 async {
4221 $Coro::current->{desc} = "abt $msg";
4222
3629 my @bt = fork_call { 4223 my @bt = fork_call {
3630 @addr = map { sprintf "%x", $_ } @addr; 4224 @addr = map { sprintf "%x", $_ } @addr;
3631 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4225 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3632 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4226 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3633 or die "addr2line: $!"; 4227 or die "addr2line: $!";
3641 } 4235 }
3642 4236
3643 @funcs 4237 @funcs
3644 }; 4238 };
3645 4239
3646 LOG llevInfo, "[ABT] $msg\n"; 4240 LOG llevInfo, "[ABT] $perl_bt\n";
4241 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3647 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3648 --$_log_backtrace; 4243 --$_log_backtrace;
3649 }; 4244 };
3650 } else { 4245 } else {
3651 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3652 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3653 } 4248 }
3654} 4249}
3655 4250
3656# load additional modules 4251# load additional modules
3657use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3658 4254
3659END { cf::emergency_save } 4255END { cf::emergency_save }
3660 4256
36611 42571
3662 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines