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.413 by root, Sun Apr 6 16:13:20 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.32 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 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;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 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 :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub 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::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns 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
192per 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.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 245that call.
199 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
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 258 my $msg = join "", @_;
207 259
208 $msg .= "\n" 260 $msg .= "\n"
209 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
210 262
211 $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;
212 264
213 LOG llevError, $msg; 265 LOG llevError, $msg;
214 }; 266};
215}
216 267
217$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
219 270
220 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 275 return;#d#
223 }#d# 276 }#d#
224 277
225 # kill coroutine otherwise 278 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 279 Coro::terminate
228}; 280};
229
230$SIG{__DIE__} = sub { }; #d#?
231 281
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 292for my $pkg (qw(
243 cf::global cf::attachable 293 cf::global cf::attachable
244 cf::object cf::object::player 294 cf::object cf::object::player
245 cf::client cf::player 295 cf::client cf::player
246 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
247 cf::map cf::party cf::region 298 cf::party cf::region
248)) { 299)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 301}
252 302
253$EV::DIED = sub { 303$EV::DIED = sub {
254 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
255}; 305};
256 306
257############################################################################# 307#############################################################################
258 308
259=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
296our $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
297 347
298sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
300 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}
364
301=item cf::lock_wait $string 365=item cf::lock_wait $string
302 366
303Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
304 368
305=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
306 370
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
310returned. 374returned.
311 375
312Locks 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
313deadlocked coro. 377deadlocked coro.
319 383
320Return 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.
321 385
322=cut 386=cut
323 387
324our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 389
327sub lock_wait($) { 390sub lock_wait($) {
328 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 392}
341 393
342sub lock_acquire($) { 394sub lock_acquire($) {
343 my ($key) = @_; 395 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 396}
357 397
358sub lock_active($) { 398sub lock_active($) {
359 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 400}
363 401
364sub freeze_mainloop { 402sub freeze_mainloop {
365 tick_inhibit_inc; 403 tick_inhibit_inc;
366 404
367 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
368} 406}
369 407
370=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
371 409
372Like 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
373get spread over timer. 411get spread over time.
374 412
375=cut 413=cut
376 414
377sub periodic($$) { 415sub periodic($$) {
378 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
395 433
396=cut 434=cut
397 435
398our @SLOT_QUEUE; 436our @SLOT_QUEUE;
399our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
400 439
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
404 443
405 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
406 446
407 while () { 447 while () {
408 next_job: 448 next_job:
449
409 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 451
411 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 456 $job->[2]->send;
415 Coro::cede; 457 Coro::cede;
416 goto next_job; 458 goto next_job;
417 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 461 }
419 } 462 }
420 463
421 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 467 $signal->wait;
425 } else { 468 } else {
469 $busy = 0;
426 Coro::schedule; 470 Coro::schedule;
427 } 471 }
428 } 472 }
429}; 473};
430 474
431sub get_slot($;$$) { 475sub get_slot($;$$) {
476 return if tick_inhibit || $Coro::current == $Coro::main;
477
432 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
433 479
434 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
435 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
436 483
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
466 513
467sub sync_job(&) { 514sub sync_job(&) {
468 my ($job) = @_; 515 my ($job) = @_;
469 516
470 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 518 my $time = AE::time;
472 519
473 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
475 522
476 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 540 } else {
494 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
495 } 542 }
496 } 543 }
497 544
498 my $time = EV::time - $time; 545 my $time = AE::time - $time;
499 546
500 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
501 548
502 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
503 } else { 550 } else {
547 reset_signals; 594 reset_signals;
548 &$cb 595 &$cb
549 }, @args; 596 }, @args;
550 597
551 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
552} 637}
553 638
554=item $value = cf::db_get $family => $key 639=item $value = cf::db_get $family => $key
555 640
556Returns a single value from the environment database. 641Returns a single value from the environment database.
695 780
696############################################################################# 781#############################################################################
697 782
698=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
699 784
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
703 788
704In 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>
705C<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
755=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
756 841
757Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
759 844
760Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 847
763These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
764 849
765=over 4 850=over 4
1056 1141
1057sub reattach { 1142sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1144 my ($obj) = @_;
1060 1145
1146 # no longer needed after getting rid of delete_package?
1061 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
1062 1148
1063 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1064 1150
1065 @$registry = (); 1151 @$registry = ();
1066 1152
1109 1195
1110 sync_job { 1196 sync_job {
1111 if (length $$rdata) { 1197 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1115 1202
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1210 aio_close $fh;
1121 1211
1122 if (@$objs) { 1212 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1221 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1223 }
1131 } else { 1224 } else {
1132 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1133 } 1226 }
1134 1227
1135 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1232 } else {
1137 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1138 } 1234 }
1139 } else { 1235 } else {
1140 aio_unlink $filename; 1236 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1142 } 1238 }
1167 $av = $st->{objs}; 1263 $av = $st->{objs};
1168 } 1264 }
1169 1265
1170 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1173 1270
1174 ($data, $av) 1271 ($data, $av)
1175} 1272}
1176 1273
1177=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1233 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1234 1331
1235 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1236} 1333}
1237 1334
1335use File::Glob ();
1336
1238cf::player->attach ( 1337cf::player->attach (
1239 on_command => sub { 1338 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1241 1340
1242 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1243 or return; 1342 or return;
1244 1343
1274 1373
1275 cf::override; 1374 cf::override;
1276 }, 1375 },
1277); 1376);
1278 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
1279sub load_extensions { 1391sub load_extensions {
1280 cf::sync_job { 1392 cf::sync_job {
1281 my %todo; 1393 my %todo;
1282 1394
1283 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1302 1414
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1417
1306 $ext{source} = 1418 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1309 . $source 1421 . $source
1310 . "\n};\n1"; 1422 . "\n};\n1";
1311 1423
1312 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1313 } 1425 }
1314 1426
1427 my $pass = 0;
1315 my %done; 1428 my %done;
1316 while (%todo) { 1429 while (%todo) {
1317 my $progress; 1430 my $progress;
1318 1431
1432 ++$pass;
1433
1434 ext:
1319 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1437 next ext
1322 unless exists $done{$_}; 1438 unless exists $done{$_};
1323 } 1439 }
1324 1440
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1442
1327 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1447
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1449 if exists $v->{meta}{mandatory};
1335 1450
1336 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1337 } 1460 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1461 }
1343 1462
1344 skip: 1463 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 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 }
1347 } 1471 }
1348 }; 1472 };
1349} 1473}
1350 1474
1351############################################################################# 1475#############################################################################
1352 1476
1353=back 1477=back
1354 1478
1355=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1356 1480
1357Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1358 1482
1359=cut 1483=cut
1360 1484
1361package cf::player; 1485package cf::player;
1362 1486
1405 1529
1406sub exists($) { 1530sub exists($) {
1407 my ($login) = @_; 1531 my ($login) = @_;
1408 1532
1409 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1411} 1535}
1412 1536
1413sub find($) { 1537sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1539 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1552 or return;
1429 1553
1430 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1431 or return; 1555 or return;
1556
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1435 } 1560 }
1436 } 1561 }
1437} 1562}
1438 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
1439sub save($) { 1577sub save($) {
1440 my ($pl) = @_; 1578 my ($pl) = @_;
1441 1579
1442 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1443 1581
1446 1584
1447 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1448 1586
1449 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1450 $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];
1451 1594
1452 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1596 cf::cede_to_tick;
1454} 1597}
1455 1598
1487 my ($pl) = @_; 1630 my ($pl) = @_;
1488 1631
1489 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1490 1633
1491 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1492 $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
1493 1636
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1498 1642
1499 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1683
1540 for my $login (@$dirs) { 1684 for my $login (@$dirs) {
1541 my $path = path $login; 1685 my $path = path $login;
1542 1686
1543 # a .pst is a dead give-away for a valid player 1687 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1688 # if no pst file found, open and chekc for blocked users
1689 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1690 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1691 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1692 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1693 }
1549 1694
1553 1698
1554 \@logins 1699 \@logins
1555} 1700}
1556 1701
1557=item $player->maps 1702=item $player->maps
1703
1704=item cf::player::maps $login
1558 1705
1559Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1560player. May block. 1707player. May block.
1561 1708
1562=cut 1709=cut
1580 } 1727 }
1581 1728
1582 \@paths 1729 \@paths
1583} 1730}
1584 1731
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1733
1587Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1735
1678=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1679 1737
1680Sends an ext reply to the player. 1738Sends an ext reply to the player.
1681 1739
1713 1771
1714=cut 1772=cut
1715 1773
1716sub find_by_path($) { 1774sub find_by_path($) {
1717 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1718 1778
1719 my ($match, $specificity); 1779 my ($match, $specificity);
1720 1780
1721 for my $region (list) { 1781 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 1808our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1809our $DEFAULT_RESET = 3000;
1750 1810
1751sub generate_random_map { 1811sub generate_random_map {
1752 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
1753 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1817 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1783 1846
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 1848}
1786 1849
1787# also paths starting with '/' 1850# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 1852
1790sub thawer_merge { 1853sub thawer_merge {
1791 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1792 1855
1793 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1879 1942
1880# the temporary/swap location 1943# the temporary/swap location
1881sub save_path { 1944sub save_path {
1882 my ($self) = @_; 1945 my ($self) = @_;
1883 1946
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1948 "$TMPDIR/$path.map"
1886} 1949}
1887 1950
1888# the unique path, undef == no special unique path 1951# the unique path, undef == no special unique path
1889sub uniq_path { 1952sub uniq_path {
1890 my ($self) = @_; 1953 my ($self) = @_;
1891 1954
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1957}
1904 1958
1905sub decay_objects { 1959sub decay_objects {
1906 my ($self) = @_; 1960 my ($self) = @_;
1907 1961
1991sub find { 2045sub find {
1992 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1993 2047
1994 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1995 2049
1996 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2052
1999 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
2004 or return; 2055 or return;
2005 2056
2006 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
2007 2058
2009 or return; 2060 or return;
2010 2061
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
2014 undef $guard1; 2066 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2067 $map->reset;
2017 return find $path; 2068 return find $path;
2018 } 2069 }
2019 2070
2020 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2021 } 2072 }
2022} 2073}
2023 2074
2024sub pre_load { } 2075sub pre_load { }
2025sub post_load { } 2076#sub post_load { } # XS
2026 2077
2027sub load { 2078sub load {
2028 my ($self) = @_; 2079 my ($self) = @_;
2029 2080
2030 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2099 $f->skip_block;
2049 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2050 or return; 2101 or return;
2051 2102
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2053 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2054 2105
2055 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2107 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2127 $self->decay_objects;
2077 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2078 $self->update_buttons; 2129 $self->update_buttons;
2079 cf::cede_to_tick; 2130 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2131 $self->activate;
2083 } 2132 }
2084 2133
2085 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2087 2136
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2137 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2138 }
2090 2139
2091 $self->post_load; 2140 $self->post_load;
2092} 2141}
2093 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
2094sub customise_for { 2146sub customise_for {
2095 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2096 2148
2097 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2150 if $self->per_player;
2114 or next; 2166 or next;
2115 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2116 or next; 2168 or next;
2117 $neigh->load; 2169 $neigh->load;
2118 2170
2171 # now find the diagonal neighbours
2119 push @neigh, 2172 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 } 2175 }
2123 2176
2151 my ($path, $origin, $load) = @_; 2204 my ($path, $origin, $load) = @_;
2152 2205
2153 $path = normalise $path, $origin && $origin->{path}; 2206 $path = normalise $path, $origin && $origin->{path};
2154 2207
2155 if (my $map = $cf::MAP{$path}) { 2208 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2210 }
2158 2211
2159 $MAP_PREFETCH{$path} |= $load; 2212 $MAP_PREFETCH{$path} |= $load;
2160 2213
2161 $MAP_PREFETCHER ||= cf::async { 2214 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2176 2229
2177 () 2230 ()
2178} 2231}
2179 2232
2233# common code, used by both ->save and ->swapout
2180sub save { 2234sub _save {
2181 my ($self) = @_; 2235 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2236
2185 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2186 2238
2187 return unless $self->dirty; 2239 return unless $self->dirty;
2188 2240
2197 2249
2198 cf::async { 2250 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2251 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2252 $_->contr->save for $self->players;
2201 }; 2253 };
2254
2255 cf::get_slot 0.02;
2202 2256
2203 if ($uniq) { 2257 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2258 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2259 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2260 } else {
2207 $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);
2208 } 2262 }
2209} 2263}
2210 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2211sub swap_out { 2273sub swap_out {
2212 my ($self) = @_; 2274 my ($self) = @_;
2213 2275
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2277
2278 return if $self->in_memory != cf::MAP_ACTIVE;
2279 return if $self->{deny_save};
2219 return if $self->players; 2280 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2221 return if $self->{deny_save};
2222 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2223 $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};
2224 2332
2225 $self->deactivate; 2333 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2335 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2336
2273 $self->unlink_save; 2337 $self->unlink_save;
2274 $self->destroy; 2338 $self->destroy;
2275} 2339}
2276 2340
2284 2348
2285 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2286 2350
2287 $self->unlink_save; 2351 $self->unlink_save;
2288 2352
2289 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2358
2343 2407
2344sub unique_maps() { 2408sub unique_maps() {
2345 [ 2409 [
2346 map { 2410 map {
2347 utf8::decode $_; 2411 utf8::decode $_;
2348 /\.map$/ 2412 s/\.map$//; # TODO future compatibility hack
2413 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2414 ? ()
2349 ? normalise $_ 2415 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2417 ]
2353} 2418}
2354 2419
2355package 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}
2356 2451
2357=back 2452=back
2358 2453
2359=head3 cf::object 2454=head3 cf::object
2360 2455
2364 2459
2365=over 4 2460=over 4
2366 2461
2367=item $ob->inv_recursive 2462=item $ob->inv_recursive
2368 2463
2369Returns 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.
2370 2466
2371=cut 2467=cut
2372 2468
2373sub inv_recursive_; 2469sub inv_recursive_;
2374sub inv_recursive_ { 2470sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2475 inv_recursive_ inv $_[0]
2380} 2476}
2381 2477
2382=item $ref = $ob->ref 2478=item $ref = $ob->ref
2383 2479
2384creates 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.
2385 2481
2386=item $ob = cf::object::deref ($refstring) 2482=item $ob = cf::object::deref ($refstring)
2387 2483
2388returns 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,
2389even if the object actually exists. May block. 2485even if the object actually exists. May block.
2421can 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
2422dialogue with the given NPC character. 2518dialogue with the given NPC character.
2423 2519
2424=cut 2520=cut
2425 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
2426# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2537# with dialog boxes.
2428#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
2429sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2442 $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));
2443 2553
2444 } else { 2554 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2557 }
2448 } 2558 }
2449} 2559}
2450 2560
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2586
2477=item $player_object->enter_link 2587=item $player_object->enter_link
2478 2588
2479Freezes 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}>).
2480 2590
2481The 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.
2482I<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.
2483 2595
2484Will never block. 2596Will never block.
2485 2597
2486=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2487 2599
2507sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2508 my ($self) = @_; 2620 my ($self) = @_;
2509 2621
2510 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2511 2623
2624 ++$self->{_link_recursion};
2625
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2627
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2516 2630
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2632}
2519 2633
2520sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2522 2636
2539 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2541 2655
2542 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2545 2659
2546 $map->load; 2660 $map->load;
2547 $map->load_neighbours; 2661 $map->load_neighbours;
2548 2662
2549 return unless $self->contr->active; 2663 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2664
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2554} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2555 2672
2673}
2674
2556=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)]])
2557 2676
2558Moves 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
2559her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2560that 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
2561the 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
2562be called at the end of this process. 2681be called at the end of this process.
2563 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
2564=cut 2686=cut
2565 2687
2566our $GOTOGEN; 2688our $GOTOGEN;
2567 2689
2568sub cf::object::player::goto { 2690sub cf::object::player::goto {
2569 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 }
2570 2698
2571 # 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
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2701
2574 $self->enter_link; 2702 $self->enter_link;
2598 my $map = eval { 2726 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2600 2728
2601 if ($map) { 2729 if ($map) {
2602 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2732 } else {
2605 $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);
2606 } 2734 }
2607 2735
2608 $map 2736 $map
2616 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2619 } 2747 }
2620 2748
2621 $done->() if $done; 2749 $done->($self) if $done;
2622 })->prio (1); 2750 })->prio (1);
2623} 2751}
2624 2752
2625=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2626 2754
2646} 2774}
2647 2775
2648sub prepare_random_map { 2776sub prepare_random_map {
2649 my ($exit) = @_; 2777 my ($exit) = @_;
2650 2778
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2781 # that depends on the exit object
2656 2782
2657 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2785 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2664 } 2792 }
2665 2793
2666 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2667 2795
2668 my $data = cf::encode_json $rmp; 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2797 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2798 my $meta = "$RANDOMDIR/$md5.meta";
2671 2799
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2802 undef $fh;
2675 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2676 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2679 } 2811 }
2680} 2812}
2681 2813
2682sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2684 2816
2685 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2686 2818
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2819 $self->enter_link;
2699 2820
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2821 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2822 $Coro::current->{desc} = "enter_exit";
2706 2823
2707 $self->deactivate_recursive; # just to be sure
2708 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
2709 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2710 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
2711 1; 2845 1
2712 }) { 2846 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2851
2718 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2735sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2737 2871
2738 utf8::encode $text; 2872 utf8::encode $text;
2739 $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);
2740} 2899}
2741 2900
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2902
2744Send 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
2748 2907
2749=cut 2908=cut
2750 2909
2751# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2753 "c/identify" => { 2918 "c/identify" => {
2754 id => "infobox", 2919 id => "infobox",
2755 title => "Identify", 2920 title => "Identify",
2756 reply => undef, 2921 reply => undef,
2757 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2759 "c/examine" => { 2924 "c/examine" => {
2760 id => "infobox", 2925 id => "infobox",
2761 title => "Examine", 2926 title => "Examine",
2762 reply => undef, 2927 reply => undef,
2763 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",
2764 }, 2935 },
2765 "c/book" => { 2936 "c/book" => {
2766 id => "infobox", 2937 id => "infobox",
2767 title => "Book", 2938 title => "Book",
2768 reply => undef, 2939 reply => undef,
2784 id => "infobox", 2955 id => "infobox",
2785 title => "Body Parts", 2956 title => "Body Parts",
2786 reply => undef, 2957 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2788 }, 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 },
2789 "c/uptime" => { 2996 "c/uptime" => {
2790 id => "infobox", 2997 id => "infobox",
2791 title => "Uptime", 2998 title => "Uptime",
2792 reply => undef, 2999 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3003 id => "infobox",
2797 title => "Map Info", 3004 title => "Map Info",
2798 reply => undef, 3005 reply => undef,
2799 tooltip => "Information related to the maps", 3006 tooltip => "Information related to the maps",
2800 }, 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,
2801); 3022);
2802 3023
2803sub cf::client::send_msg { 3024sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3026
2806 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2807 3029
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3031
2810 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2813 3035
2814 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2818 3038
2819 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3044 }
2826 3045
2827 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2828 } 3047 }
2829 3048
2830 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2831 3050
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3051 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2836 3054
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3058 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3059
2851 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3061}
2865 3062
2866=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2867 3064
2868Sends an ext event to the client. 3065Sends an ext event to the client.
2871 3068
2872sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2874 3071
2875 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3077 }
2881} 3078}
2882 3079
2883=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2884 3081
2888 3085
2889sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2891 3088
2892 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3092 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3095 }
2899} 3096}
2900 3097
2901=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2902 3099
3003 3200
3004 $coro 3201 $coro
3005} 3202}
3006 3203
3007cf::client->attach ( 3204cf::client->attach (
3008 on_destroy => sub { 3205 on_client_destroy => sub {
3009 my ($ns) = @_; 3206 my ($ns) = @_;
3010 3207
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3209 },
3013); 3210);
3029our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3030 3227
3031$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3032 3229
3033$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3036 sort time 3233 sort time
3037)); 3234));
3038 3235
3039# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3042 3239
3043The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3044 3241
3045 cf::object 3242 cf::object
3046 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
3047 insert remove name archname title slaying race decrease_ob_nr 3244 insert remove name archname title slaying race decrease split
3245 value
3048 3246
3049 cf::object::player 3247 cf::object::player
3050 player 3248 player
3051 3249
3052 cf::player 3250 cf::player
3057 3255
3058=cut 3256=cut
3059 3257
3060for ( 3258for (
3061 ["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
3062 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3067) { 3265) {
3068 no strict 'refs'; 3266 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3088 3286
3089 my $qcode = $code; 3287 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3092 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3093 local $_; 3294 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3295
3096 my $eval = 3296 my $eval =
3097 "do {\n" 3297 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3300 . $code
3101 . "\n}" 3301 . "\n}"
3102 ; 3302 ;
3103 3303
3304 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 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 }
3107 3313
3108 if ($@) { 3314 if ($@) {
3109 warn "$@"; 3315 warn "$@";
3110 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3130=cut 3336=cut
3131 3337
3132sub register_script_function { 3338sub register_script_function {
3133 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3134 3340
3135 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3137} 3343}
3138 3344
3139=back 3345=back
3140 3346
3141=cut 3347=cut
3162 3368
3163 $facedata->{version} == 2 3369 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3371
3166 # 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]);
3167 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3375 type => FT_RSRC,
3169 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),
3170 }; 3378 };
3171 cf::cede_to_tick; 3379 cf::cede_to_tick;
3172 3380
3173 { 3381 {
3174 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3386
3179 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3183 3391
3184 cf::cede_to_tick; 3392 cf::cede_to_tick;
3185 } 3393 }
3186 3394
3187 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3211 3419
3212 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3213 } 3421 }
3214 3422
3215 { 3423 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3219 3425
3220 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3429
3225 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3240 } else { 3432 } else {
3241 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3242 } 3434 }
3243 3435
3244 cf::cede_to_tick; 3436 cf::cede_to_tick;
3245 } 3437 }
3246 } 3438 }
3247 3439
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3441
3250 1 3442 1
3251} 3443}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3444
3273register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3275 3447
3276 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
3278 } 3450 }
3279}; 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}
3280 3462
3281sub reload_regions { 3463sub reload_regions {
3282 # 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
3283 # for this (global event?) 3465 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3298} 3480}
3299 3481
3300sub reload_archetypes { 3482sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3484 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3485}
3309 3486
3310sub reload_treasures { 3487sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3313} 3490}
3314 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
3315sub reload_resources { 3515sub reload_resources {
3316 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3317 3517
3518 reload_facedata;
3519 reload_sound;
3520 reload_archetypes;
3318 reload_regions; 3521 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3522 reload_treasures;
3323 3523
3324 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3325} 3525}
3326 3526
3327sub init {
3328 reload_resources;
3329}
3330
3331sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3531 or return;
3334 3532
3335 local $/; 3533 local $/;
3336 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3337 3535
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3537
3340 $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};
3341 $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};
3342 3540
3343 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3545 };
3348 warn $@ if $@; 3546 warn $@ if $@;
3349 } 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;
3350} 3578}
3351 3579
3352sub 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
3353 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3355 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#
3356 (async { 3593 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3594 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3595 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3596 })->prio (Coro::PRIO_MAX);
3360 }; 3597 };
3361 3598
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 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;
3611 reload_config;
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
3622 load_extensions;
3623
3624 utime time, time, $RUNTIMEFILE;
3625
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;
3369} 3637}
3370 3638
3371############################################################################# 3639#############################################################################
3372# initialisation and cleanup 3640# initialisation and cleanup
3373 3641
3374# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3375BEGIN { 3643BEGIN {
3376 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3380 }; 3648 };
3381 } 3649 }
3382} 3650}
3383 3651
3384sub write_runtime { 3652sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3653 my $t0 = AE::time;
3386 3654
3387 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3389 3657
3390 IO::AIO::aio_utime $runtime, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3659
3392 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3393 3661
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3663 or return;
3396 3664
3397 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3677 aio_utime $fh, undef, undef;
3410 3678
3411 close $fh 3679 close $fh
3412 or return; 3680 or return;
3413 3681
3414 aio_rename "$runtime~", $runtime 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3683 and return;
3416 3684
3417 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3686
3419 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 };
3420} 3738}
3421 3739
3422sub emergency_save() { 3740sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3424 3742
3425 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3426 3744
3427 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
3428 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3757 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3759 $pl->save;
3437 } 3760 }
3438 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3439 3762
3440 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3766 $map->valid or next;
3444 $map->save; 3767 $map->save;
3445 } 3768 }
3446 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3447 3770
3448 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3450 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";
3451 }; 3778 };
3452 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
3453 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3454} 3786}
3455 3787
3456sub post_cleanup { 3788sub post_cleanup {
3457 my ($make_core) = @_; 3789 my ($make_core) = @_;
3458 3790
3459 warn Carp::longmess "post_cleanup backtrace" 3791 warn Carp::longmess "post_cleanup backtrace"
3460 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 }
3461} 3821}
3462 3822
3463sub do_reload_perl() { 3823sub do_reload_perl() {
3464 # can/must only be called in main 3824 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3466 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3467 return; 3827 return;
3468 } 3828 }
3469 3829
3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3833
3834 while ($RELOAD) {
3470 warn "reloading..."; 3835 warn "reloading...";
3471 3836
3472 warn "entering sync_job"; 3837 warn "entering sync_job";
3473 3838
3474 cf::sync_job { 3839 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3840 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3841 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3842 cf::write_runtime_sync; # external watchdog should not bark
3478 3843
3479 warn "syncing database to disk"; 3844 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3845 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3846
3482 # 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
3483 3848
3484 warn "flushing outstanding aio requests"; 3849 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3850 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3851 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3852 }
3516 3853
3517 warn "... nuking $pkg"; 3854 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3855 $_->cancel for values %EXT_CORO;
3519 } 3856 %EXT_CORO = ();
3520 3857
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3858 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3859 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3860
3861 warn "removing ext/exti commands";
3862 %EXTCMD = ();
3863 %EXTICMD = ();
3864
3865 warn "unloading/nuking all extensions";
3866 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3867 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3868
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3869 if (my $cb = $pkg->can ("unload")) {
3870 eval {
3532 $cb->(); 3871 $cb->($pkg);
3872 1
3873 } or warn "$pkg unloaded, but with errors: $@";
3874 }
3875
3876 warn "... clearing $pkg";
3877 clear_package $pkg;
3533 } 3878 }
3534 3879
3535 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;
3536 } 3895 }
3537 3896
3538 warn "getting rid of safe::, as good as possible"; 3897 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3898 clear_package "safe::$_"
3540 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);
3541 3900
3542 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3904
3546 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3906 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3549 3908
3550 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3551 3910
3552 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3553 require cf; 3912 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3555 3914
3556 warn "loading config and database again"; 3915 warn "loading config and database again";
3557 cf::reload_config; 3916 cf::reload_config;
3558 3917
3559 warn "loading extensions"; 3918 warn "loading extensions";
3560 cf::load_extensions; 3919 cf::load_extensions;
3561 3920
3921 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3568 3929
3930 warn "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3932
3569 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3570 3934
3571 1 3935 1
3572 } or do { 3936 } or do {
3573 warn $@; 3937 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3938 cf::cleanup "error while reloading, exiting.";
3575 }; 3939 };
3576 3940
3577 warn "reloaded"; 3941 warn "reloaded";
3942 --$RELOAD;
3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3578}; 3947};
3579 3948
3580our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3581 3950
3582sub reload_perl() { 3951sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3585 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3959 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3589 }; 3962 };
3590} 3963}
3591 3964
3592register_command "reload" => sub { 3965register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3607 3980
3608our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3610 3983
3611sub wait_for_tick { 3984sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 3986
3615 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3989 $signal->wait;
3618} 3990}
3619 3991
3620sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 3994
3624 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3997 $signal->wait;
3627} 3998}
3633 return; 4004 return;
3634 } 4005 }
3635 4006
3636 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
3637 4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4010
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4013 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4015 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4016 or warn "ERROR: unable to write runtime file: $!";
3644 }; 4017 };
3645 } 4018 }
3646 4019
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4020 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3664} 4037}
3665 4038
3666{ 4039{
3667 # configure BDB 4040 # configure BDB
3668 4041
3669 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3672 4045
3673 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4048 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | 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;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4051 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4052 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4053
3680 cf::sync_job { 4054 cf::sync_job {
3681 eval { 4055 eval {
3707{ 4081{
3708 # configure IO::AIO 4082 # configure IO::AIO
3709 4083
3710 IO::AIO::min_parallel 8; 4084 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4085 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4086 undef $AnyEvent::AIO::WATCHER;
3713} 4087}
3714 4088
3715my $_log_backtrace; 4089my $_log_backtrace;
3716 4090
3717sub _log_backtrace { 4091sub _log_backtrace {
3720 $msg =~ s/\n//; 4094 $msg =~ s/\n//;
3721 4095
3722 # limit the # of concurrent backtraces 4096 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4097 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 4098 ++$_log_backtrace;
4099 my $perl_bt = Carp::longmess $msg;
3725 async { 4100 async {
3726 $Coro::current->{desc} = "abt $msg"; 4101 $Coro::current->{desc} = "abt $msg";
3727 4102
3728 my @bt = fork_call { 4103 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4104 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4115 }
3741 4116
3742 @funcs 4117 @funcs
3743 }; 4118 };
3744 4119
3745 LOG llevInfo, "[ABT] $msg\n"; 4120 LOG llevInfo, "[ABT] $perl_bt\n";
4121 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4122 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4123 --$_log_backtrace;
3748 }; 4124 };
3749 } else { 4125 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4126 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4128 }
3753} 4129}
3754 4130
3755# load additional modules 4131# load additional modules
3756use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3757 4134
3758END { cf::emergency_save } 4135END { cf::emergency_save }
3759 4136
37601 41371
3761 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines