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.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 80
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 127our $DB_ENV;
87 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
88our %CFG; 131our %CFG;
89 132
90our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 134our $RUNTIME;
135our $NOW;
92 136
93our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
96 140
97# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 143
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
103 153
104binmode STDOUT; 154binmode STDOUT;
105binmode STDERR; 155binmode STDERR;
106 156
107# read virtual server time, if available 157# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
112} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
113 165
114mkdir $_ 166mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 168
117our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
118 170
119sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 187
121############################################################################# 188#############################################################################
122 189
123=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
124 191
171returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
172per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 240
174=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
175 242
176This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 245that call.
179 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
180=back 253=back
181 254
182=cut 255=cut
183 256
184BEGIN { 257$Coro::State::WARNHOOK = sub {
185 *CORE::GLOBAL::warn = sub {
186 my $msg = join "", @_; 258 my $msg = join "", @_;
187 259
188 $msg .= "\n" 260 $msg .= "\n"
189 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
190 262
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 264
193 LOG llevError, $msg; 265 LOG llevError, $msg;
194 }; 266};
195} 267
268$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "=="
270
271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d#
276 }#d#
277
278 # kill coroutine otherwise
279 Coro::terminate
280};
196 281
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 292for my $pkg (qw(
208 cf::global cf::attachable 293 cf::global cf::attachable
209 cf::object cf::object::player 294 cf::object cf::object::player
210 cf::client cf::player 295 cf::client cf::player
211 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
212 cf::map cf::party cf::region 298 cf::party cf::region
213)) { 299)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 301}
217 302
218$EV::DIED = sub { 303$EV::DIED = sub {
219 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
220}; 305};
221 306
222############################################################################# 307#############################################################################
223 308
224=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 331 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 332 $d
248 } || "[unable to dump $_[0]: '$@']"; 333 } || "[unable to dump $_[0]: '$@']";
249} 334}
250 335
251=item $ref = cf::from_json $json 336=item $ref = cf::decode_json $json
252 337
253Converts a JSON string into the corresponding perl data structure. 338Converts a JSON string into the corresponding perl data structure.
254 339
255=item $json = cf::to_json $ref 340=item $json = cf::encode_json $ref
256 341
257Converts a perl data structure into its JSON representation. 342Converts a perl data structure into its JSON representation.
258 343
259=cut 344=cut
260 345
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 347
263sub to_json ($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
265 364
266=item cf::lock_wait $string 365=item cf::lock_wait $string
267 366
268Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
269 368
270=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
271 370
272Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
275returned. 374returned.
276 375
277Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 377deadlocked coro.
284 383
285Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
286 385
287=cut 386=cut
288 387
289our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 389
292sub lock_wait($) { 390sub lock_wait($) {
293 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 392}
306 393
307sub lock_acquire($) { 394sub lock_acquire($) {
308 my ($key) = @_; 395 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 396}
322 397
323sub lock_active($) { 398sub lock_active($) {
324 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 400}
328 401
329sub freeze_mainloop { 402sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 403 tick_inhibit_inc;
331 404
332 my $guard = Coro::guard { 405 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 406}
338 407
339=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
340 409
341Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 411get spread over time.
343 412
344=cut 413=cut
345 414
346sub periodic($$) { 415sub periodic($$) {
347 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
364 433
365=cut 434=cut
366 435
367our @SLOT_QUEUE; 436our @SLOT_QUEUE;
368our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
369 439
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
373 443
374 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
375 446
376 while () { 447 while () {
377 next_job: 448 next_job:
449
378 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 451
380 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 456 $job->[2]->send;
384 Coro::cede; 457 Coro::cede;
385 goto next_job; 458 goto next_job;
386 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 461 }
388 } 462 }
389 463
390 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 467 $signal->wait;
394 } else { 468 } else {
469 $busy = 0;
395 Coro::schedule; 470 Coro::schedule;
396 } 471 }
397 } 472 }
398}; 473};
399 474
400sub get_slot($;$$) { 475sub get_slot($;$$) {
476 return if tick_inhibit || $Coro::current == $Coro::main;
477
401 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
402 479
403 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
404 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
405 483
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
435 513
436sub sync_job(&) { 514sub sync_job(&) {
437 my ($job) = @_; 515 my ($job) = @_;
438 516
439 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
440 my $time = EV::time; 518 my $time = AE::time;
441 519
442 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
444 522
445 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
446 524
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 525 my $freeze_guard = freeze_mainloop;
450 526
451 my $busy = 1; 527 my $busy = 1;
452 my @res; 528 my @res;
453 529
464 } else { 540 } else {
465 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
466 } 542 }
467 } 543 }
468 544
469 $time = EV::time - $time; 545 my $time = AE::time - $time;
470 546
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
475 548
476 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
477 } else { 550 } else {
478 # we are in another coroutine, how wonderful, everything just works 551 # we are in another coroutine, how wonderful, everything just works
479 552
521 reset_signals; 594 reset_signals;
522 &$cb 595 &$cb
523 }, @args; 596 }, @args;
524 597
525 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
610}
611
612=item $coin = coin_from_name $name
613
614=cut
615
616our %coin_alias = (
617 "silver" => "silvercoin",
618 "silvercoin" => "silvercoin",
619 "silvercoins" => "silvercoin",
620 "gold" => "goldcoin",
621 "goldcoin" => "goldcoin",
622 "goldcoins" => "goldcoin",
623 "platinum" => "platinacoin",
624 "platinumcoin" => "platinacoin",
625 "platinumcoins" => "platinacoin",
626 "platina" => "platinacoin",
627 "platinacoin" => "platinacoin",
628 "platinacoins" => "platinacoin",
629 "royalty" => "royalty",
630 "royalties" => "royalty",
631);
632
633sub coin_from_name($) {
634 $coin_alias{$_[0]}
635 ? cf::arch::find $coin_alias{$_[0]}
636 : undef
526} 637}
527 638
528=item $value = cf::db_get $family => $key 639=item $value = cf::db_get $family => $key
529 640
530Returns a single value from the environment database. 641Returns a single value from the environment database.
669 780
670############################################################################# 781#############################################################################
671 782
672=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
673 784
674Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
677 788
678In the following description, CLASS can be any of C<global>, C<object> 789In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 790C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
730 841
731Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
733 844
734Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
736 847
737These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
738 849
739=over 4 850=over 4
967 } 1078 }
968 1079
969 0 1080 0
970} 1081}
971 1082
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1083=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1084
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1085=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1086
976Generate an object-specific event with the given arguments. 1087Generate an object-specific event with the given arguments.
977 1088
1030 1141
1031sub reattach { 1142sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1144 my ($obj) = @_;
1034 1145
1146 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1148
1037 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1038 1150
1039 @$registry = (); 1151 @$registry = ();
1040 1152
1055cf::attachable->attach ( 1167cf::attachable->attach (
1056 prio => -1000000, 1168 prio => -1000000,
1057 on_instantiate => sub { 1169 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1170 my ($obj, $data) = @_;
1059 1171
1060 $data = from_json $data; 1172 $data = decode_json $data;
1061 1173
1062 for (@$data) { 1174 for (@$data) {
1063 my ($name, $args) = @$_; 1175 my ($name, $args) = @$_;
1064 1176
1065 $obj->attach ($name, %{$args || {} }); 1177 $obj->attach ($name, %{$args || {} });
1083 1195
1084 sync_job { 1196 sync_job {
1085 if (length $$rdata) { 1197 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1089 1202
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1094 close $fh; 1210 aio_close $fh;
1095 1211
1096 if (@$objs) { 1212 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1102 close $fh; 1221 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1223 }
1105 } else { 1224 } else {
1106 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1107 } 1226 }
1108 1227
1109 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1232 } else {
1111 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1112 } 1234 }
1113 } else { 1235 } else {
1114 aio_unlink $filename; 1236 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1116 } 1238 }
1141 $av = $st->{objs}; 1263 $av = $st->{objs};
1142 } 1264 }
1143 1265
1144 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1147 1270
1148 ($data, $av) 1271 ($data, $av)
1149} 1272}
1150 1273
1151=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1208 1331
1209 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1210} 1333}
1211 1334
1335use File::Glob ();
1336
1212cf::player->attach ( 1337cf::player->attach (
1213 on_command => sub { 1338 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1215 1340
1216 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1217 or return; 1342 or return;
1218 1343
1248 1373
1249 cf::override; 1374 cf::override;
1250 }, 1375 },
1251); 1376);
1252 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1253sub load_extensions { 1391sub load_extensions {
1254 cf::sync_job { 1392 cf::sync_job {
1255 my %todo; 1393 my %todo;
1256 1394
1257 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1276 1414
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1417
1280 $ext{source} = 1418 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1283 . $source 1421 . $source
1284 . "\n};\n1"; 1422 . "\n};\n1";
1285 1423
1286 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1287 } 1425 }
1288 1426
1427 my $pass = 0;
1289 my %done; 1428 my %done;
1290 while (%todo) { 1429 while (%todo) {
1291 my $progress; 1430 my $progress;
1292 1431
1432 ++$pass;
1433
1434 ext:
1293 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1437 next ext
1296 unless exists $done{$_}; 1438 unless exists $done{$_};
1297 } 1439 }
1298 1440
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1442
1301 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1447
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1449 if exists $v->{meta}{mandatory};
1306 warn $msg; 1450
1307 warn "mandatory extension failed to load, exiting.\n"; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1452 delete $todo{$k};
1309 } 1453 } else {
1310 1454 $done{$k} = delete $todo{$k};
1311 warn $msg; 1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1312 } 1460 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1461 }
1318 1462
1319 skip: 1463 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1322 } 1471 }
1323 }; 1472 };
1324} 1473}
1325 1474
1326############################################################################# 1475#############################################################################
1327 1476
1328=back 1477=back
1329 1478
1330=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1331 1480
1332Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1333 1482
1334=cut 1483=cut
1335 1484
1336package cf::player; 1485package cf::player;
1337 1486
1380 1529
1381sub exists($) { 1530sub exists($) {
1382 my ($login) = @_; 1531 my ($login) = @_;
1383 1532
1384 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1386} 1535}
1387 1536
1388sub find($) { 1537sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1539 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1552 or return;
1404 1553
1405 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1406 or return; 1555 or return;
1556
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1410 } 1560 }
1411 } 1561 }
1412} 1562}
1413 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1414sub save($) { 1577sub save($) {
1415 my ($pl) = @_; 1578 my ($pl) = @_;
1416 1579
1417 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1418 1581
1421 1584
1422 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1423 1586
1424 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1589
1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1594
1427 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1596 cf::cede_to_tick;
1429} 1597}
1430 1598
1462 my ($pl) = @_; 1630 my ($pl) = @_;
1463 1631
1464 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1465 1633
1466 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1636
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1473 1642
1474 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1683
1515 for my $login (@$dirs) { 1684 for my $login (@$dirs) {
1516 my $path = path $login; 1685 my $path = path $login;
1517 1686
1518 # a .pst is a dead give-away for a valid player 1687 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1688 # if no pst file found, open and chekc for blocked users
1689 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1690 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1691 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1692 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1693 }
1524 1694
1528 1698
1529 \@logins 1699 \@logins
1530} 1700}
1531 1701
1532=item $player->maps 1702=item $player->maps
1703
1704=item cf::player::maps $login
1533 1705
1534Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1535player. May block. 1707player. May block.
1536 1708
1537=cut 1709=cut
1555 } 1727 }
1556 1728
1557 \@paths 1729 \@paths
1558} 1730}
1559 1731
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1733
1562Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1735
1653=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1654 1737
1655Sends an ext reply to the player. 1738Sends an ext reply to the player.
1656 1739
1688 1771
1689=cut 1772=cut
1690 1773
1691sub find_by_path($) { 1774sub find_by_path($) {
1692 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1693 1778
1694 my ($match, $specificity); 1779 my ($match, $specificity);
1695 1780
1696 for my $region (list) { 1781 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1808our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1809our $DEFAULT_RESET = 3000;
1725 1810
1726sub generate_random_map { 1811sub generate_random_map {
1727 my ($self, $rmp) = @_; 1812 my ($self, $rmp) = @_;
1813
1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815
1728 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1817 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1846
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1848}
1761 1849
1762# also paths starting with '/' 1850# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1852
1765sub thawer_merge { 1853sub thawer_merge {
1766 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1767 1855
1768 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1854 1942
1855# the temporary/swap location 1943# the temporary/swap location
1856sub save_path { 1944sub save_path {
1857 my ($self) = @_; 1945 my ($self) = @_;
1858 1946
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1948 "$TMPDIR/$path.map"
1861} 1949}
1862 1950
1863# the unique path, undef == no special unique path 1951# the unique path, undef == no special unique path
1864sub uniq_path { 1952sub uniq_path {
1865 my ($self) = @_; 1953 my ($self) = @_;
1866 1954
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1957}
1879 1958
1880sub decay_objects { 1959sub decay_objects {
1881 my ($self) = @_; 1960 my ($self) = @_;
1882 1961
1966sub find { 2045sub find {
1967 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1968 2047
1969 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1970 2049
1971 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2052
1974 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1979 or return; 2055 or return;
1980 2056
1981 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1982 2058
1984 or return; 2060 or return;
1985 2061
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
1989 undef $guard1; 2066 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2067 $map->reset;
1992 return find $path; 2068 return find $path;
1993 } 2069 }
1994 2070
1995 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1996 } 2072 }
1997} 2073}
1998 2074
1999sub pre_load { } 2075sub pre_load { }
2000sub post_load { } 2076#sub post_load { } # XS
2001 2077
2002sub load { 2078sub load {
2003 my ($self) = @_; 2079 my ($self) = @_;
2004 2080
2005 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2099 $f->skip_block;
2024 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2025 or return; 2101 or return;
2026 2102
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2028 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2029 2105
2030 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2107 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2127 $self->decay_objects;
2052 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2053 $self->update_buttons; 2129 $self->update_buttons;
2054 cf::cede_to_tick; 2130 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2131 $self->activate;
2058 } 2132 }
2059 2133
2060 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2062 2136
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2137 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2138 }
2065 2139
2066 $self->post_load; 2140 $self->post_load;
2067} 2141}
2068 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2069sub customise_for { 2146sub customise_for {
2070 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2071 2148
2072 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2150 if $self->per_player;
2089 or next; 2166 or next;
2090 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2091 or next; 2168 or next;
2092 $neigh->load; 2169 $neigh->load;
2093 2170
2171 # now find the diagonal neighbours
2094 push @neigh, 2172 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 } 2175 }
2098 2176
2126 my ($path, $origin, $load) = @_; 2204 my ($path, $origin, $load) = @_;
2127 2205
2128 $path = normalise $path, $origin && $origin->{path}; 2206 $path = normalise $path, $origin && $origin->{path};
2129 2207
2130 if (my $map = $cf::MAP{$path}) { 2208 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2210 }
2133 2211
2134 $MAP_PREFETCH{$path} |= $load; 2212 $MAP_PREFETCH{$path} |= $load;
2135 2213
2136 $MAP_PREFETCHER ||= cf::async { 2214 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2151 2229
2152 () 2230 ()
2153} 2231}
2154 2232
2233# common code, used by both ->save and ->swapout
2155sub save { 2234sub _save {
2156 my ($self) = @_; 2235 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2236
2160 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2161 2238
2162 return unless $self->dirty; 2239 return unless $self->dirty;
2163 2240
2172 2249
2173 cf::async { 2250 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2251 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2252 $_->contr->save for $self->players;
2176 }; 2253 };
2254
2255 cf::get_slot 0.02;
2177 2256
2178 if ($uniq) { 2257 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2258 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2259 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2260 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2262 }
2184} 2263}
2185 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2186sub swap_out { 2273sub swap_out {
2187 my ($self) = @_; 2274 my ($self) = @_;
2188 2275
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2277
2278 return if $self->in_memory != cf::MAP_ACTIVE;
2279 return if $self->{deny_save};
2194 return if $self->players; 2280 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2198 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2199 2332
2200 $self->deactivate; 2333 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2335 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2336
2248 $self->unlink_save; 2337 $self->unlink_save;
2249 $self->destroy; 2338 $self->destroy;
2250} 2339}
2251 2340
2259 2348
2260 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2261 2350
2262 $self->unlink_save; 2351 $self->unlink_save;
2263 2352
2264 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2358
2318 2407
2319sub unique_maps() { 2408sub unique_maps() {
2320 [ 2409 [
2321 map { 2410 map {
2322 utf8::decode $_; 2411 utf8::decode $_;
2323 /\.map$/ 2412 s/\.map$//; # TODO future compatibility hack
2413 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2414 ? ()
2324 ? normalise $_ 2415 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2417 ]
2328} 2418}
2329 2419
2330package cf; 2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2331 2451
2332=back 2452=back
2333 2453
2334=head3 cf::object 2454=head3 cf::object
2335 2455
2339 2459
2340=over 4 2460=over 4
2341 2461
2342=item $ob->inv_recursive 2462=item $ob->inv_recursive
2343 2463
2344Returns the inventory of the object _and_ their inventories, recursively. 2464Returns the inventory of the object I<and> their inventories, recursively,
2465but I<not> the object itself.
2345 2466
2346=cut 2467=cut
2347 2468
2348sub inv_recursive_; 2469sub inv_recursive_;
2349sub inv_recursive_ { 2470sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2475 inv_recursive_ inv $_[0]
2355} 2476}
2356 2477
2357=item $ref = $ob->ref 2478=item $ref = $ob->ref
2358 2479
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2480Creates and returns a persistent reference to an object that can be stored as a string.
2360 2481
2361=item $ob = cf::object::deref ($refstring) 2482=item $ob = cf::object::deref ($refstring)
2362 2483
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2484returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2485even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2517can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2518dialogue with the given NPC character.
2398 2519
2399=cut 2520=cut
2400 2521
2522our $SAY_CHANNEL = {
2523 id => "say",
2524 title => "Map",
2525 reply => "say ",
2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2527};
2528
2529our $CHAT_CHANNEL = {
2530 id => "chat",
2531 title => "Chat",
2532 reply => "chat ",
2533 tooltip => "Player chat and shouts, global to the server.",
2534};
2535
2401# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2537# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2538#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2552 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2553
2419 } else { 2554 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2557 }
2423 } 2558 }
2424} 2559}
2425 2560
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2586
2452=item $player_object->enter_link 2587=item $player_object->enter_link
2453 2588
2454Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2455 2590
2456The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2458 2595
2459Will never block. 2596Will never block.
2460 2597
2461=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2462 2599
2482sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2483 my ($self) = @_; 2620 my ($self) = @_;
2484 2621
2485 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2486 2623
2624 ++$self->{_link_recursion};
2625
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2627
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2491 2630
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2632}
2494 2633
2495sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2497 2636
2514 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2516 2655
2517 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2520 2659
2521 $map->load; 2660 $map->load;
2522 $map->load_neighbours; 2661 $map->load_neighbours;
2523 2662
2524 return unless $self->contr->active; 2663 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2664
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2529} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2530 2672
2673}
2674
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2676
2533Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2681be called at the end of this process.
2538 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2539=cut 2686=cut
2540 2687
2541our $GOTOGEN; 2688our $GOTOGEN;
2542 2689
2543sub cf::object::player::goto { 2690sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2545 2698
2546 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2701
2549 $self->enter_link; 2702 $self->enter_link;
2573 my $map = eval { 2726 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2575 2728
2576 if ($map) { 2729 if ($map) {
2577 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2732 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2734 }
2582 2735
2583 $map 2736 $map
2591 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2594 } 2747 }
2595 2748
2596 $done->() if $done; 2749 $done->($self) if $done;
2597 })->prio (1); 2750 })->prio (1);
2598} 2751}
2599 2752
2600=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2601 2754
2621} 2774}
2622 2775
2623sub prepare_random_map { 2776sub prepare_random_map {
2624 my ($exit) = @_; 2777 my ($exit) = @_;
2625 2778
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2781 # that depends on the exit object
2631 2782
2632 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2785 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2639 } 2792 }
2640 2793
2641 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2642 2795
2643 my $data = cf::to_json $rmp; 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2797 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2798 my $meta = "$RANDOMDIR/$md5.meta";
2646 2799
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2802 undef $fh;
2650 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2651 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2654 } 2811 }
2655} 2812}
2656 2813
2657sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2659 2816
2660 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2661 2818
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2819 $self->enter_link;
2674 2820
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2821 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2822 $Coro::current->{desc} = "enter_exit";
2681 2823
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2824 unless (eval {
2825 $self->deactivate_recursive; # just to be sure
2826
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2836 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp;
2838
2684 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2685 2840
2841 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y)
2843 if $exit->flag (cf::FLAG_DAMNED);
2844
2686 1; 2845 1
2687 }) { 2846 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2851
2693 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2710sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2712 2871
2713 utf8::encode $text; 2872 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2715} 2899}
2716 2900
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2902
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2907
2724=cut 2908=cut
2725 2909
2726# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2728 "c/identify" => { 2918 "c/identify" => {
2729 id => "infobox", 2919 id => "infobox",
2730 title => "Identify", 2920 title => "Identify",
2731 reply => undef, 2921 reply => undef,
2732 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2734 "c/examine" => { 2924 "c/examine" => {
2735 id => "infobox", 2925 id => "infobox",
2736 title => "Examine", 2926 title => "Examine",
2737 reply => undef, 2927 reply => undef,
2738 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2935 },
2740 "c/book" => { 2936 "c/book" => {
2741 id => "infobox", 2937 id => "infobox",
2742 title => "Book", 2938 title => "Book",
2743 reply => undef, 2939 reply => undef,
2759 id => "infobox", 2955 id => "infobox",
2760 title => "Body Parts", 2956 title => "Body Parts",
2761 reply => undef, 2957 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2763 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2764 "c/uptime" => { 2996 "c/uptime" => {
2765 id => "infobox", 2997 id => "infobox",
2766 title => "Uptime", 2998 title => "Uptime",
2767 reply => undef, 2999 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3003 id => "infobox",
2772 title => "Map Info", 3004 title => "Map Info",
2773 reply => undef, 3005 reply => undef,
2774 tooltip => "Information related to the maps", 3006 tooltip => "Information related to the maps",
2775 }, 3007 },
3008 "c/party" => {
3009 id => "party",
3010 title => "Party",
3011 reply => "gsay ",
3012 tooltip => "Messages and chat related to your party",
3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2776); 3022);
2777 3023
2778sub cf::client::send_msg { 3024sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3026
2781 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2782 3029
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3031
2785 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2788 3035
2789 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2793 3038
2794 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3044 }
2801 3045
2802 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2803 } 3047 }
2804 3048
2805 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2806 3050
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3051 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2811 3054
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3058 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3059
2826 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3061}
2840 3062
2841=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2842 3064
2843Sends an ext event to the client. 3065Sends an ext event to the client.
2846 3068
2847sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2849 3071
2850 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3077 }
2856} 3078}
2857 3079
2858=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2859 3081
2863 3085
2864sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2866 3088
2867 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3092 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3095 }
2874} 3096}
2875 3097
2876=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2877 3099
2978 3200
2979 $coro 3201 $coro
2980} 3202}
2981 3203
2982cf::client->attach ( 3204cf::client->attach (
2983 on_destroy => sub { 3205 on_client_destroy => sub {
2984 my ($ns) = @_; 3206 my ($ns) = @_;
2985 3207
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3209 },
2988); 3210);
3004our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3005 3227
3006$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3007 3229
3008$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3011 sort time 3233 sort time
3012)); 3234));
3013 3235
3014# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3017 3239
3018The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3019 3241
3020 cf::object 3242 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3244 insert remove name archname title slaying race decrease split
3245 value
3023 3246
3024 cf::object::player 3247 cf::object::player
3025 player 3248 player
3026 3249
3027 cf::player 3250 cf::player
3032 3255
3033=cut 3256=cut
3034 3257
3035for ( 3258for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3042) { 3265) {
3043 no strict 'refs'; 3266 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 3286
3064 my $qcode = $code; 3287 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3067 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3068 local $_; 3294 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3295
3071 my $eval = 3296 my $eval =
3072 "do {\n" 3297 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3300 . $code
3076 . "\n}" 3301 . "\n}"
3077 ; 3302 ;
3078 3303
3304 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3082 3313
3083 if ($@) { 3314 if ($@) {
3084 warn "$@"; 3315 warn "$@";
3085 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3105=cut 3336=cut
3106 3337
3107sub register_script_function { 3338sub register_script_function {
3108 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3109 3340
3110 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3112} 3343}
3113 3344
3114=back 3345=back
3115 3346
3116=cut 3347=cut
3137 3368
3138 $facedata->{version} == 2 3369 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3371
3141 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3375 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3378 };
3146 cf::cede_to_tick; 3379 cf::cede_to_tick;
3147 3380
3148 { 3381 {
3149 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3150 3383
3151 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386
3153 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3391
3158 cf::cede_to_tick; 3392 cf::cede_to_tick;
3159 } 3393 }
3160 3394
3161 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3396 next unless $info->{smooth};
3397
3163 my $idx = cf::face::find $face 3398 my $idx = cf::face::find $face
3164 or next; 3399 or next;
3400
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3401 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3402 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3404 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3405 warn "smooth face '$info->{smooth}' not found for face '$face'";
3183 3419
3184 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3185 } 3421 }
3186 3422
3187 { 3423 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3191 3425
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3427 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3429
3198 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3431 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3432 } else {
3208 $data = $info->{data}; 3433 $RESOURCE{$name} = $info; # unused
3209 } 3434 }
3210 3435
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3436 cf::cede_to_tick;
3215 } 3437 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3438 }
3439
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3441
3236 1 3442 1
3237} 3443}
3238 3444
3239register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3241 3447
3242 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
3244 } 3450 }
3245}; 3451};
3452
3453sub load_resource_file($) {
3454 my $guard = lock_acquire "load_resource_file";
3455
3456 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100;
3458 cf::arch::commit_load;
3459
3460 $status
3461}
3246 3462
3247sub reload_regions { 3463sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3464 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3465 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3480}
3265 3481
3266sub reload_archetypes { 3482sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3484 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3485}
3275 3486
3276sub reload_treasures { 3487sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3279} 3490}
3280 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3281sub reload_resources { 3515sub reload_resources {
3282 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3283 3517
3518 reload_facedata;
3519 reload_sound;
3520 reload_archetypes;
3284 reload_regions; 3521 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3522 reload_treasures;
3289 3523
3290 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3291} 3525}
3292 3526
3293sub init {
3294 reload_resources;
3295}
3296
3297sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3531 or return;
3300 3532
3301 local $/; 3533 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3303 3535
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3537
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3540
3309 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3545 };
3314 warn $@ if $@; 3546 warn $@ if $@;
3315 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3550}
3551
3552sub pidfile() {
3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3554 or die "$PIDFILE: $!";
3555 flock $fh, &Fcntl::LOCK_EX
3556 or die "$PIDFILE: flock: $!";
3557 $fh
3558}
3559
3560# make sure only one server instance is running at any one time
3561sub atomic {
3562 my $fh = pidfile;
3563
3564 my $pid = <$fh>;
3565 kill 9, $pid if $pid > 0;
3566
3567 seek $fh, 0, 0;
3568 print $fh $$;
3569}
3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3316} 3578}
3317 3579
3318sub main { 3580sub main {
3581 cf::init_globals; # initialise logging
3582
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3589
3319 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3592 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3593 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3594 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3595 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3596 })->prio (Coro::PRIO_MAX);
3326 }; 3597 };
3327 3598
3599 evthread_start IO::AIO::poll_fileno;
3600
3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3610 reload_resources;
3328 reload_config; 3611 reload_config;
3329 db_init; 3612 db_init;
3613
3614 cf::init_uuid;
3615 cf::init_signals;
3616 cf::init_skills;
3617
3618 cf::init_beforeplay;
3619
3620 atomic;
3621
3330 load_extensions; 3622 load_extensions;
3331 3623
3332 $TICK_WATCHER->start; 3624 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3625
3334 EV::loop; 3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3629
3630 (pop @POST_INIT)->(0) while @POST_INIT;
3631 };
3632
3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3335} 3637}
3336 3638
3337############################################################################# 3639#############################################################################
3338# initialisation and cleanup 3640# initialisation and cleanup
3339 3641
3340# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3341BEGIN { 3643BEGIN {
3342 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3346 }; 3648 };
3347 } 3649 }
3348} 3650}
3349 3651
3350sub write_runtime { 3652sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3653 my $t0 = AE::time;
3352 3654
3353 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3355 3657
3356 IO::AIO::aio_utime $runtime, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3659
3358 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3359 3661
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3663 or return;
3362 3664
3363 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3677 aio_utime $fh, undef, undef;
3376 3678
3377 close $fh 3679 close $fh
3378 or return; 3680 or return;
3379 3681
3380 aio_rename "$runtime~", $runtime 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3683 and return;
3382 3684
3383 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3686
3385 1 3687 1
3688}
3689
3690our $uuid_lock;
3691our $uuid_skip;
3692
3693sub write_uuid_sync($) {
3694 $uuid_skip ||= $_[0];
3695
3696 return if $uuid_lock;
3697 local $uuid_lock = 1;
3698
3699 my $uuid = "$LOCALDIR/uuid";
3700
3701 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3702 or return;
3703
3704 my $value = uuid_seq uuid_cur;
3705
3706 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n";
3708 return;
3709 }
3710
3711 my $value = uuid_str $value + $uuid_skip;
3712 $uuid_skip = 0;
3713
3714 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3715 and return;
3716
3717 # always fsync - this file is important
3718 aio_fsync $fh
3719 and return;
3720
3721 close $fh
3722 or return;
3723
3724 aio_rename "$uuid~", $uuid
3725 and return;
3726
3727 warn "uuid file written ($value).\n";
3728
3729 1
3730
3731}
3732
3733sub write_uuid($$) {
3734 my ($skip, $sync) = @_;
3735
3736 $sync ? write_uuid_sync $skip
3737 : async { write_uuid_sync $skip };
3386} 3738}
3387 3739
3388sub emergency_save() { 3740sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3390 3742
3391 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3392 3744
3393 cf::sync_job { 3745 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750
3394 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3757 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3759 $pl->save;
3403 } 3760 }
3404 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3405 3762
3406 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3766 $map->valid or next;
3410 $map->save; 3767 $map->save;
3411 } 3768 }
3412 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3413 3770
3414 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3774
3775 warn "emergency_perl_save: begin write uuid\n";
3776 write_uuid_sync 1;
3777 warn "emergency_perl_save: end write uuid\n";
3417 }; 3778 };
3418 3779
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3419 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3420} 3786}
3421 3787
3422sub post_cleanup { 3788sub post_cleanup {
3423 my ($make_core) = @_; 3789 my ($make_core) = @_;
3424 3790
3425 warn Carp::longmess "post_cleanup backtrace" 3791 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3792 if $make_core;
3793
3794 my $fh = pidfile;
3795 unlink $PIDFILE if <$fh> == $$;
3796}
3797
3798# a safer delete_package, copied from Symbol
3799sub clear_package($) {
3800 my $pkg = shift;
3801
3802 # expand to full symbol table name if needed
3803 unless ($pkg =~ /^main::.*::$/) {
3804 $pkg = "main$pkg" if $pkg =~ /^::/;
3805 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3806 $pkg .= '::' unless $pkg =~ /::$/;
3807 }
3808
3809 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3810 my $stem_symtab = *{$stem}{HASH};
3811
3812 defined $stem_symtab and exists $stem_symtab->{$leaf}
3813 or return;
3814
3815 # clear all symbols
3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3817 for my $name (keys %$leaf_symtab) {
3818 _gv_clear *{"$pkg$name"};
3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3820 }
3427} 3821}
3428 3822
3429sub do_reload_perl() { 3823sub do_reload_perl() {
3430 # can/must only be called in main 3824 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3432 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3433 return; 3827 return;
3434 } 3828 }
3435 3829
3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3833
3834 while ($RELOAD) {
3436 warn "reloading..."; 3835 warn "reloading...";
3437 3836
3438 warn "entering sync_job"; 3837 warn "entering sync_job";
3439 3838
3440 cf::sync_job { 3839 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3840 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3841 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3842 cf::write_runtime_sync; # external watchdog should not bark
3444 3843
3445 warn "syncing database to disk"; 3844 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3845 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3846
3448 # if anything goes wrong in here, we should simply crash as we already saved 3847 # if anything goes wrong in here, we should simply crash as we already saved
3449 3848
3450 warn "flushing outstanding aio requests"; 3849 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs; 3850 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3851 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = ();
3464
3465 warn "removing commands";
3466 %COMMAND = ();
3467
3468 warn "removing ext/exti commands";
3469 %EXTCMD = ();
3470 %EXTICMD = ();
3471
3472 warn "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg";
3475
3476 if (my $cb = $pkg->can ("unload")) {
3477 eval {
3478 $cb->($pkg);
3479 1
3480 } or warn "$pkg unloaded, but with errors: $@";
3481 } 3852 }
3482 3853
3483 warn "... nuking $pkg"; 3854 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3855 $_->cancel for values %EXT_CORO;
3485 } 3856 %EXT_CORO = ();
3486 3857
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3858 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3859 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3860
3861 warn "removing ext/exti commands";
3862 %EXTCMD = ();
3863 %EXTICMD = ();
3864
3865 warn "unloading/nuking all extensions";
3866 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3867 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3868
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3869 if (my $cb = $pkg->can ("unload")) {
3870 eval {
3498 $cb->(); 3871 $cb->($pkg);
3872 1
3873 } or warn "$pkg unloaded, but with errors: $@";
3874 }
3875
3876 warn "... clearing $pkg";
3877 clear_package $pkg;
3499 } 3878 }
3500 3879
3501 Symbol::delete_package $k; 3880 warn "unloading all perl modules loaded from $LIBDIR";
3881 while (my ($k, $v) = each %INC) {
3882 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3883
3884 warn "... unloading $k";
3885 delete $INC{$k};
3886
3887 $k =~ s/\.pm$//;
3888 $k =~ s/\//::/g;
3889
3890 if (my $cb = $k->can ("unload_module")) {
3891 $cb->();
3892 }
3893
3894 clear_package $k;
3502 } 3895 }
3503 3896
3504 warn "getting rid of safe::, as good as possible"; 3897 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3898 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3900
3508 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3904
3512 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3906 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3515 3908
3516 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3517 3910
3518 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3519 require cf; 3912 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3521 3914
3522 warn "loading config and database again"; 3915 warn "loading config and database again";
3523 cf::reload_config; 3916 cf::reload_config;
3524 3917
3525 warn "loading extensions"; 3918 warn "loading extensions";
3526 cf::load_extensions; 3919 cf::load_extensions;
3527 3920
3921 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3534 3929
3930 warn "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3932
3535 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3536 3934
3537 1 3935 1
3538 } or do { 3936 } or do {
3539 warn $@; 3937 warn $@;
3540 warn "error while reloading, exiting."; 3938 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3939 };
3543 3940
3544 warn "reloaded"; 3941 warn "reloaded";
3942 --$RELOAD;
3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3545}; 3947};
3546 3948
3547our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3548 3950
3549sub reload_perl() { 3951sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3552 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3959 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3961 };
3556 }; 3962 };
3557} 3963}
3558 3964
3559register_command "reload" => sub { 3965register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3574 3980
3575our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3577 3983
3578sub wait_for_tick { 3984sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 3986
3582 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3989 $signal->wait;
3585} 3990}
3586 3991
3587sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 3994
3591 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3997 $signal->wait;
3594} 3998}
3595 3999
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4000sub tick {
3597 if ($Coro::current != $Coro::main) { 4001 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4002 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3600 return; 4004 return;
3601 } 4005 }
3602 4006
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
3606 4008
3607 $RUNTIME += $TICK; 4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 4010
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4013 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4015 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4016 or warn "ERROR: unable to write runtime file: $!";
3616 }; 4017 };
3617 } 4018 }
3618 4019
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4020 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 4022 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4023 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 4024 $sig->send;
3624 } 4025 }
3625 4026
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4027 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4028 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4029
3629 _post_tick; 4030 if (0) {
3630}; 4031 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4032 my $jitter = $TICK_START - $NEXT_TICK;
4033 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4034 warn "jitter $JITTER\n";#d#
4035 }
4036 }
4037}
3632 4038
3633{ 4039{
4040 # configure BDB
4041
3634 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4044 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4045
3653 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4048 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4049 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4050 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4051 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4052 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4053
3660 cf::sync_job { 4054 cf::sync_job {
3661 eval { 4055 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4077 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4078 };
3685} 4079}
3686 4080
3687{ 4081{
4082 # configure IO::AIO
4083
3688 IO::AIO::min_parallel 8; 4084 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4085 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4086 undef $AnyEvent::AIO::WATCHER;
3693} 4087}
3694 4088
3695my $_log_backtrace; 4089my $_log_backtrace;
3696 4090
3697sub _log_backtrace { 4091sub _log_backtrace {
3700 $msg =~ s/\n//; 4094 $msg =~ s/\n//;
3701 4095
3702 # limit the # of concurrent backtraces 4096 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4097 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4098 ++$_log_backtrace;
4099 my $perl_bt = Carp::longmess $msg;
3705 async { 4100 async {
3706 $Coro::current->{desc} = "abt $msg"; 4101 $Coro::current->{desc} = "abt $msg";
3707 4102
3708 my @bt = fork_call { 4103 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4104 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4115 }
3721 4116
3722 @funcs 4117 @funcs
3723 }; 4118 };
3724 4119
3725 LOG llevInfo, "[ABT] $msg\n"; 4120 LOG llevInfo, "[ABT] $perl_bt\n";
4121 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4122 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4123 --$_log_backtrace;
3728 }; 4124 };
3729 } else { 4125 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4126 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4128 }
3733} 4129}
3734 4130
3735# load additional modules 4131# load additional modules
3736use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3737 4134
3738END { cf::emergency_save } 4135END { cf::emergency_save }
3739 4136
37401 41371
3741 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines