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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.526 by root, Wed Apr 21 05:48:35 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; 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 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
60AnyEvent::detect; 65AnyEvent::detect;
61 66
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 77
70$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" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
98 115
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 118our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
103 120
104our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 124our $DB_ENV;
108 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
109our %CFG; 128our %CFG;
110 129
111our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 131our $RUNTIME;
113our $NOW; 132our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 143our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
126 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
127binmode STDOUT; 151binmode STDOUT;
128binmode STDERR; 152binmode STDERR;
129 153
130# read virtual server time, if available 154# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
135} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
136 162
137mkdir $_ 163mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 165
140our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
141 167
142sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143 184
144############################################################################# 185#############################################################################
145 186
146=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
147 188
194returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
195per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 237
197=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
198 239
199This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 242that call.
202 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
203=back 250=back
204 251
205=cut 252=cut
206 253
207BEGIN { 254$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 255 my $msg = join "", @_;
210 256
211 $msg .= "\n" 257 $msg .= "\n"
212 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
213 259
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 261
216 LOG llevError, $msg; 262 LOG llevError, $msg;
217 }; 263};
218}
219 264
220$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
222 267
223 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 272 return;#d#
226 }#d# 273 }#d#
227 274
228 # kill coroutine otherwise 275 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 276 Coro::terminate
231}; 277};
232
233$SIG{__DIE__} = sub { }; #d#?
234 278
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
245for my $pkg (qw( 289for my $pkg (qw(
246 cf::global cf::attachable 290 cf::global cf::attachable
247 cf::object cf::object::player 291 cf::object cf::object::player
248 cf::client cf::player 292 cf::client cf::player
249 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
250 cf::map cf::party cf::region 295 cf::party cf::region
251)) { 296)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 298}
255 299
256$EV::DIED = sub { 300$EV::DIED = sub {
257 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
258}; 302};
259 303
260############################################################################# 304#############################################################################
261 305
262=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 344
301sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
303 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
304=item cf::lock_wait $string 362=item cf::lock_wait $string
305 363
306Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
307 365
308=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
309 367
310Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
313returned. 371returned.
314 372
315Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 374deadlocked coro.
322 380
323Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
324 382
325=cut 383=cut
326 384
327our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 386
330sub lock_wait($) { 387sub lock_wait($) {
331 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 389}
344 390
345sub lock_acquire($) { 391sub lock_acquire($) {
346 my ($key) = @_; 392 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 393}
360 394
361sub lock_active($) { 395sub lock_active($) {
362 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 397}
366 398
367sub freeze_mainloop { 399sub freeze_mainloop {
368 tick_inhibit_inc; 400 tick_inhibit_inc;
369 401
370 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
371} 403}
372 404
373=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
374 406
375Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 408get spread over time.
377 409
378=cut 410=cut
379 411
380sub periodic($$) { 412sub periodic($$) {
381 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
398 430
399=cut 431=cut
400 432
401our @SLOT_QUEUE; 433our @SLOT_QUEUE;
402our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
403 436
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
407 440
408 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
409 443
410 while () { 444 while () {
411 next_job: 445 next_job:
446
412 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 448
414 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 453 $job->[2]->send;
418 Coro::cede; 454 Coro::cede;
419 goto next_job; 455 goto next_job;
420 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 458 }
422 } 459 }
423 460
424 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 464 $signal->wait;
428 } else { 465 } else {
466 $busy = 0;
429 Coro::schedule; 467 Coro::schedule;
430 } 468 }
431 } 469 }
432}; 470};
433 471
434sub get_slot($;$$) { 472sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
436 474
437 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
438 476
439 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
440 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
441 480
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
471 510
472sub sync_job(&) { 511sub sync_job(&) {
473 my ($job) = @_; 512 my ($job) = @_;
474 513
475 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 515 my $time = AE::time;
477 516
478 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
480 519
481 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
498 } else { 537 } else {
499 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
500 } 539 }
501 } 540 }
502 541
503 my $time = EV::time - $time; 542 my $time = AE::time - $time;
504 543
505 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
506 545
507 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
508 } else { 547 } else {
552 reset_signals; 591 reset_signals;
553 &$cb 592 &$cb
554 }, @args; 593 }, @args;
555 594
556 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
557} 607}
558 608
559=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
560 610
561=cut 611=cut
727 777
728############################################################################# 778#############################################################################
729 779
730=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
731 781
732Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
735 785
736In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
788 838
789Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
791 841
792Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
794 844
795These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
796 846
797=over 4 847=over 4
1088 1138
1089sub reattach { 1139sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1141 my ($obj) = @_;
1092 1142
1143 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1145
1095 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1096 1147
1097 @$registry = (); 1148 @$registry = ();
1098 1149
1146 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1147 1198
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1152 aio_close $fh; 1206 aio_close $fh;
1153 1207
1154 if (@$objs) { 1208 if (@$objs) {
1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1160 aio_close $fh; 1217 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1219 }
1163 } else { 1220 } else {
1164 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1165 } 1222 }
1166 1223
1167 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1228 } else {
1169 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1170 } 1230 }
1171 } else { 1231 } else {
1172 aio_unlink $filename; 1232 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1174 } 1234 }
1265 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1266 1326
1267 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1268} 1328}
1269 1329
1330use File::Glob ();
1331
1270cf::player->attach ( 1332cf::player->attach (
1271 on_command => sub { 1333 on_unknown_command => sub {
1272 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1273 1335
1274 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1275 or return; 1337 or return;
1276 1338
1306 1368
1307 cf::override; 1369 cf::override;
1308 }, 1370 },
1309); 1371);
1310 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1311sub load_extensions { 1386sub load_extensions {
1312 cf::sync_job { 1387 cf::sync_job {
1313 my %todo; 1388 my %todo;
1314 1389
1315 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1334 1409
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1412
1338 $ext{source} = 1413 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1341 . $source 1416 . $source
1342 . "\n};\n1"; 1417 . "\n};\n1";
1343 1418
1344 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1345 } 1420 }
1346 1421
1422 my $pass = 0;
1347 my %done; 1423 my %done;
1348 while (%todo) { 1424 while (%todo) {
1349 my $progress; 1425 my $progress;
1350 1426
1427 ++$pass;
1428
1429 ext:
1351 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1352 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1353 goto skip 1432 next ext
1354 unless exists $done{$_}; 1433 unless exists $done{$_};
1355 } 1434 }
1356 1435
1357 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1358 1437
1359 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1360 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1361 : "$v->{base}: extension inactive.\n";
1362 1442
1363 if (exists $v->{meta}{mandatory}) {
1364 warn $msg;
1365 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1366 } 1444 if exists $v->{meta}{mandatory};
1367 1445
1368 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1369 } 1455 }
1370
1371 $done{$k} = delete $todo{$k};
1372 push @EXTS, $v->{pkg};
1373 $progress = 1;
1374 } 1456 }
1375 1457
1376 skip: 1458 unless ($progress) {
1377 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1378 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1379 } 1466 }
1380 }; 1467 };
1381} 1468}
1382 1469
1383############################################################################# 1470#############################################################################
1384 1471
1385=back 1472=back
1386 1473
1387=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1388 1475
1389Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1390 1477
1391=cut 1478=cut
1392 1479
1393package cf::player; 1480package cf::player;
1394 1481
1437 1524
1438sub exists($) { 1525sub exists($) {
1439 my ($login) = @_; 1526 my ($login) = @_;
1440 1527
1441 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1443} 1530}
1444 1531
1445sub find($) { 1532sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1534 my $login = $_[0];
1467 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1468 } 1555 }
1469 } 1556 }
1470} 1557}
1471 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1472sub save($) { 1572sub save($) {
1473 my ($pl) = @_; 1573 my ($pl) = @_;
1474 1574
1475 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1476 1576
1481 1581
1482 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1483 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1484 1584
1485 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1486 1589
1487 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1488 cf::cede_to_tick; 1591 cf::cede_to_tick;
1489} 1592}
1490 1593
1522 my ($pl) = @_; 1625 my ($pl) = @_;
1523 1626
1524 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1525 1628
1526 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1631
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1633 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1635 $pl->ob->check_score;
1592 \@logins 1695 \@logins
1593} 1696}
1594 1697
1595=item $player->maps 1698=item $player->maps
1596 1699
1700=item cf::player::maps $login
1701
1597Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1598player. May block. 1703player. May block.
1599 1704
1600=cut 1705=cut
1601 1706
1618 } 1723 }
1619 1724
1620 \@paths 1725 \@paths
1621} 1726}
1622 1727
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1729
1625Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1731
1716=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1717 1733
1718Sends an ext reply to the player. 1734Sends an ext reply to the player.
1719 1735
1751 1767
1752=cut 1768=cut
1753 1769
1754sub find_by_path($) { 1770sub find_by_path($) {
1755 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1756 1774
1757 my ($match, $specificity); 1775 my ($match, $specificity);
1758 1776
1759 for my $region (list) { 1777 for my $region (list) {
1760 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793 1811
1794 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1795 $self->_create_random_map ( 1813 $self->_create_random_map (
1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1800 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1801 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1802 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1824 1842
1825 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1826} 1844}
1827 1845
1828# also paths starting with '/' 1846# also paths starting with '/'
1829$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1830 1848
1831sub thawer_merge { 1849sub thawer_merge {
1832 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1833 1851
1834 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1932 1950
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1935} 1953}
1936 1954
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 1955sub decay_objects {
1947 my ($self) = @_; 1956 my ($self) = @_;
1948 1957
1949 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1950 1959
2032sub find { 2041sub find {
2033 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
2034 2043
2035 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
2036 2045
2037 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
2039 2048
2040 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
2045 or return; 2051 or return;
2046 2052
2047 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
2048 2054
2060 2066
2061 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2062 } 2068 }
2063} 2069}
2064 2070
2065sub pre_load { } 2071sub pre_load { }
2066sub post_load { } 2072#sub post_load { } # XS
2067 2073
2068sub load { 2074sub load {
2069 my ($self) = @_; 2075 my ($self) = @_;
2070 2076
2071 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2095 $f->skip_block;
2090 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
2091 or return; 2097 or return;
2092 2098
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
2094 if delete $self->{load_original}; 2100 if delete $self->{load_original};
2095 2101
2096 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2103 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
2116 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2123 $self->decay_objects;
2118 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2119 $self->update_buttons; 2125 $self->update_buttons;
2120 cf::cede_to_tick; 2126 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick;
2123 $self->activate; 2127 $self->activate;
2124 } 2128 }
2125 2129
2126 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2130 } 2134 }
2131 2135
2132 $self->post_load; 2136 $self->post_load;
2133} 2137}
2134 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2135sub customise_for { 2142sub customise_for {
2136 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2137 2144
2138 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2139 if $self->per_player; 2146 if $self->per_player;
2216 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2217 2224
2218 () 2225 ()
2219} 2226}
2220 2227
2228# common code, used by both ->save and ->swapout
2221sub save { 2229sub _save {
2222 my ($self) = @_; 2230 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2231
2226 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2227 2233
2228 return unless $self->dirty; 2234 return unless $self->dirty;
2229 2235
2249 } else { 2255 } else {
2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2251 } 2257 }
2252} 2258}
2253 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2254sub swap_out { 2268sub swap_out {
2255 my ($self) = @_; 2269 my ($self) = @_;
2256 2270
2257 # save first because save cedes
2258 $self->save;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261 2272
2262 return if $self->players;
2263 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2264 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2265 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2267 2327
2268 $self->deactivate; 2328 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2270 $self->clear; 2330 $self->clear;
2271}
2272
2273sub reset_at {
2274 my ($self) = @_;
2275
2276 # TODO: safety, remove and allow resettable per-player maps
2277 return 1e99 if $self->{deny_reset};
2278
2279 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2280 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2281
2282 $time + $to
2283}
2284
2285sub should_reset {
2286 my ($self) = @_;
2287
2288 $self->reset_at <= $cf::RUNTIME
2289}
2290
2291sub reset {
2292 my ($self) = @_;
2293
2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295
2296 return if $self->players;
2297
2298 warn "resetting map ", $self->path;
2299
2300 $self->in_memory (cf::MAP_SWAPPED);
2301
2302 # need to save uniques path
2303 unless ($self->{deny_save}) {
2304 my $uniq = $self->uniq_path; utf8::encode $uniq;
2305
2306 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2307 if $uniq;
2308 }
2309
2310 delete $cf::MAP{$self->path};
2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2314 $self->clear;
2315 2331
2316 $self->unlink_save; 2332 $self->unlink_save;
2317 $self->destroy; 2333 $self->destroy;
2318} 2334}
2319 2335
2327 2343
2328 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2329 2345
2330 $self->unlink_save; 2346 $self->unlink_save;
2331 2347
2332 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2333 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2334 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2335 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2337 2353
2394 : normalise $_ 2410 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2412 ]
2397} 2413}
2398 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2399=back 2447=back
2400 2448
2401=head3 cf::object 2449=head3 cf::object
2402 2450
2403=cut 2451=cut
2468 2516
2469our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2470 id => "say", 2518 id => "say",
2471 title => "Map", 2519 title => "Map",
2472 reply => "say ", 2520 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2474}; 2522};
2475 2523
2476our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2477 id => "chat", 2525 id => "chat",
2478 title => "Chat", 2526 title => "Chat",
2533 2581
2534=item $player_object->enter_link 2582=item $player_object->enter_link
2535 2583
2536Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2537 2585
2538The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2540 2590
2541Will never block. 2591Will never block.
2542 2592
2543=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2544 2594
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2620
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2573 2623
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2625}
2576 2626
2577sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2579 2629
2596 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2598 2648
2599 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2602 2652
2603 $map->load; 2653 $map->load;
2604 $map->load_neighbours; 2654 $map->load_neighbours;
2605 2655
2606 return unless $self->contr->active; 2656 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2657
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again
2611} 2664}
2612 2665
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2614 2667
2615Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2669her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2670that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2671the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2672be called at the end of this process.
2673
2674Note that $check will be called with a potentially non-loaded map, so if
2675it needs a loaded map it has to call C<< ->load >>.
2620 2676
2621=cut 2677=cut
2622 2678
2623our $GOTOGEN; 2679our $GOTOGEN;
2624 2680
2771 $self->contr->savebed ($map, $x, $y) 2827 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2828 if $exit->flag (cf::FLAG_DAMNED);
2773 2829
2774 1 2830 1
2775 }) { 2831 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2832 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2833 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2834 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2835 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2836
2781 warn "ERROR in enter_exit: $@"; 2837 warn "ERROR in enter_exit: $@";
2798sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2800 2856
2801 utf8::encode $text; 2857 utf8::encode $text;
2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2859}
2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2803} 2884}
2804 2885
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 2887
2807Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2811 2892
2812=cut 2893=cut
2813 2894
2814# non-persistent channels (usually the info channel) 2895# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2816 "c/identify" => { 2903 "c/identify" => {
2817 id => "infobox", 2904 id => "infobox",
2818 title => "Identify", 2905 title => "Identify",
2819 reply => undef, 2906 reply => undef,
2820 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2822 "c/examine" => { 2909 "c/examine" => {
2823 id => "infobox", 2910 id => "infobox",
2824 title => "Examine", 2911 title => "Examine",
2825 reply => undef, 2912 reply => undef,
2826 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2827 }, 2920 },
2828 "c/book" => { 2921 "c/book" => {
2829 id => "infobox", 2922 id => "infobox",
2830 title => "Book", 2923 title => "Book",
2831 reply => undef, 2924 reply => undef,
2847 id => "infobox", 2940 id => "infobox",
2848 title => "Body Parts", 2941 title => "Body Parts",
2849 reply => undef, 2942 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2943 tooltip => "Shows which body parts you posess and are available",
2851 }, 2944 },
2945 "c/statistics" => {
2946 id => "infobox",
2947 title => "Statistics",
2948 reply => undef,
2949 tooltip => "Shows your primary statistics",
2950 },
2951 "c/skills" => {
2952 id => "infobox",
2953 title => "Skills",
2954 reply => undef,
2955 tooltip => "Shows your experience per skill and item power",
2956 },
2957 "c/shopitems" => {
2958 id => "infobox",
2959 title => "Shop Items",
2960 reply => undef,
2961 tooltip => "Shows the items currently for sale in this shop",
2962 },
2963 "c/resistances" => {
2964 id => "infobox",
2965 title => "Resistances",
2966 reply => undef,
2967 tooltip => "Shows your resistances",
2968 },
2969 "c/pets" => {
2970 id => "infobox",
2971 title => "Pets",
2972 reply => undef,
2973 tooltip => "Shows information abotu your pets/a specific pet",
2974 },
2975 "c/perceiveself" => {
2976 id => "infobox",
2977 title => "Perceive Self",
2978 reply => undef,
2979 tooltip => "You gained detailed knowledge about yourself",
2980 },
2852 "c/uptime" => { 2981 "c/uptime" => {
2853 id => "infobox", 2982 id => "infobox",
2854 title => "Uptime", 2983 title => "Uptime",
2855 reply => undef, 2984 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2985 tooltip => "How long the server has been running since last restart",
2865 id => "party", 2994 id => "party",
2866 title => "Party", 2995 title => "Party",
2867 reply => "gsay ", 2996 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2997 tooltip => "Messages and chat related to your party",
2869 }, 2998 },
2999 "c/death" => {
3000 id => "death",
3001 title => "Death",
3002 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death",
3004 },
3005 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL,
2870); 3007);
2871 3008
2872sub cf::client::send_msg { 3009sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2874 3011
2875 $msg = $self->pl->expand_cfpod ($msg); 3012 $msg = $self->pl->expand_cfpod ($msg)
3013 unless $color & cf::NDI_VERBATIM;
2876 3014
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 3015 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 3016
2879 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 3018 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 3019 $channel = $CHANNEL{$channel};
2882 3020
2883 $self->ext_msg (channel_info => $channel) 3021 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2887 3023
2888 } elsif (ref $channel) { 3024 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 3029 }
2895 3030
2896 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2897 } 3032 }
2898 3033
2899 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2900 3035
2901 if ($self->can_msg) {
2902 # default colour, mask it out 3036 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2905 3039
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3040 my $pkt = "msg "
3041 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 3043 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 3044
2920 $color &= cf::NDI_COLOR_MASK; 3045 $self->send_big_packet ($pkt);
2921
2922 utf8::encode $msg;
2923
2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 }
2933} 3046}
2934 3047
2935=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2936 3049
2937Sends an ext event to the client. 3050Sends an ext event to the client.
2940 3053
2941sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2943 3056
2944 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3062 }
2950} 3063}
2951 3064
2952=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2953 3066
2957 3070
2958sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2960 3073
2961 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove 3077 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 } 3080 }
2968} 3081}
2969 3082
2970=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2971 3084
3072 3185
3073 $coro 3186 $coro
3074} 3187}
3075 3188
3076cf::client->attach ( 3189cf::client->attach (
3077 on_destroy => sub { 3190 on_client_destroy => sub {
3078 my ($ns) = @_; 3191 my ($ns) = @_;
3079 3192
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3194 },
3082); 3195);
3098our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3099 3212
3100$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3101 3214
3102$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3105 sort time 3218 sort time
3106)); 3219));
3107 3220
3108# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
3113 3226
3114 cf::object 3227 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3228 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3229 insert remove name archname title slaying race decrease split
3230 value
3117 3231
3118 cf::object::player 3232 cf::object::player
3119 player 3233 player
3120 3234
3121 cf::player 3235 cf::player
3127=cut 3241=cut
3128 3242
3129for ( 3243for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3244 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3246 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
3136) { 3250) {
3137 no strict 'refs'; 3251 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3157 3271
3158 my $qcode = $code; 3272 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3161 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
3162 local $_; 3279 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3280
3165 my $eval = 3281 my $eval =
3166 "do {\n" 3282 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3285 . $code
3170 . "\n}" 3286 . "\n}"
3171 ; 3287 ;
3172 3288
3289 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
3176 3298
3177 if ($@) { 3299 if ($@) {
3178 warn "$@"; 3300 warn "$@";
3179 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
3199=cut 3321=cut
3200 3322
3201sub register_script_function { 3323sub register_script_function {
3202 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3203 3325
3204 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3206} 3328}
3207 3329
3208=back 3330=back
3209 3331
3210=cut 3332=cut
3231 3353
3232 $facedata->{version} == 2 3354 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3356
3235 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3236 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC, 3360 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3239 }; 3363 };
3240 cf::cede_to_tick; 3364 cf::cede_to_tick;
3241 3365
3242 { 3366 {
3243 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3245 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3371
3248 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3252 3376
3253 cf::cede_to_tick; 3377 cf::cede_to_tick;
3254 } 3378 }
3255 3379
3256 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3280 3404
3281 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3282 } 3406 }
3283 3407
3284 { 3408 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3288 3410
3289 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) { 3412 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3414
3294 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type}; 3416 cf::face::set_type $idx, $info->{type};
3309 } else { 3417 } else {
3310 $RESOURCE{$name} = $info; 3418 $RESOURCE{$name} = $info;
3311 } 3419 }
3312 3420
3395 reload_treasures; 3503 reload_treasures;
3396 3504
3397 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3398} 3506}
3399 3507
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3512 or return;
3409 3513
3410 local $/; 3514 local $/;
3411 *CFG = YAML::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3412 3516
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3518
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3526 };
3423 warn $@ if $@; 3527 warn $@ if $@;
3424 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3531}
3532
3533sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!";
3536 flock $fh, &Fcntl::LOCK_EX
3537 or die "$PIDFILE: flock: $!";
3538 $fh
3539}
3540
3541# make sure only one server instance is running at any one time
3542sub atomic {
3543 my $fh = pidfile;
3544
3545 my $pid = <$fh>;
3546 kill 9, $pid if $pid > 0;
3547
3548 seek $fh, 0, 0;
3549 print $fh $$;
3550}
3551
3552sub main_loop {
3553 warn "EV::loop starting\n";
3554 if (1) {
3555 EV::loop;
3556 }
3557 warn "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP;
3425} 3559}
3426 3560
3427sub main { 3561sub main {
3562 cf::init_globals; # initialise logging
3563
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570
3428 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3574 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3575 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3576 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3577 })->prio (Coro::PRIO_MAX);
3435 }; 3578 };
3436 3579
3437 { 3580 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3581
3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3591 reload_resources;
3439 reload_config; 3592 reload_config;
3440 db_init; 3593 db_init;
3594
3595 cf::init_uuid;
3596 cf::init_signals;
3597 cf::init_skills;
3598
3599 cf::init_beforeplay;
3600
3601 atomic;
3602
3441 load_extensions; 3603 load_extensions;
3442 3604
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3605 utime time, time, $RUNTIMEFILE;
3606
3607 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610
3611 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3612 };
3445 3613
3446 EV::loop; 3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3616
3617 main_loop;
3447} 3618}
3448 3619
3449############################################################################# 3620#############################################################################
3450# initialisation and cleanup 3621# initialisation and cleanup
3451 3622
3452# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3453BEGIN { 3624BEGIN {
3454 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3458 }; 3629 };
3459 } 3630 }
3460} 3631}
3461 3632
3462sub write_runtime_sync { 3633sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3634 my $t0 = AE::time;
3464 3635
3465 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3467 3638
3468 IO::AIO::aio_utime $runtime, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3640
3470 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3471 3642
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3644 or return;
3474 3645
3475 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3658 aio_utime $fh, undef, undef;
3488 3659
3489 close $fh 3660 close $fh
3490 or return; 3661 or return;
3491 3662
3492 aio_rename "$runtime~", $runtime 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3664 and return;
3494 3665
3495 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3667
3497 1 3668 1
3498} 3669}
3499 3670
3500our $uuid_lock; 3671our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3680 my $uuid = "$LOCALDIR/uuid";
3510 3681
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3682 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3683 or return;
3513 3684
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3685 my $value = uuid_seq uuid_cur;
3686
3687 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n";
3689 return;
3690 }
3691
3692 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3693 $uuid_skip = 0;
3516 3694
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3695 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3696 and return;
3519 3697
3541} 3719}
3542 3720
3543sub emergency_save() { 3721sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3545 3723
3546 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3547 3725
3548 cf::sync_job { 3726 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731
3549 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3738 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3740 $pl->save;
3558 } 3741 }
3559 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3560 3743
3561 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3747 $map->valid or next;
3565 $map->save; 3748 $map->save;
3566 } 3749 }
3567 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3568 3751
3569 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3754 warn "emergency_perl_save: end database checkpoint\n";
3572 3755
3573 warn "begin write uuid\n"; 3756 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3757 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3758 warn "emergency_perl_save: end write uuid\n";
3576 }; 3759 };
3577 3760
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3578 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3579} 3767}
3580 3768
3581sub post_cleanup { 3769sub post_cleanup {
3582 my ($make_core) = @_; 3770 my ($make_core) = @_;
3583 3771
3584 warn Carp::longmess "post_cleanup backtrace" 3772 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3773 if $make_core;
3774
3775 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$;
3777}
3778
3779# a safer delete_package, copied from Symbol
3780sub clear_package($) {
3781 my $pkg = shift;
3782
3783 # expand to full symbol table name if needed
3784 unless ($pkg =~ /^main::.*::$/) {
3785 $pkg = "main$pkg" if $pkg =~ /^::/;
3786 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3787 $pkg .= '::' unless $pkg =~ /::$/;
3788 }
3789
3790 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3791 my $stem_symtab = *{$stem}{HASH};
3792
3793 defined $stem_symtab and exists $stem_symtab->{$leaf}
3794 or return;
3795
3796 # clear all symbols
3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3798 for my $name (keys %$leaf_symtab) {
3799 _gv_clear *{"$pkg$name"};
3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3801 }
3586} 3802}
3587 3803
3588sub do_reload_perl() { 3804sub do_reload_perl() {
3589 # can/must only be called in main 3805 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3591 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3592 return; 3808 return;
3593 } 3809 }
3594 3810
3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3814
3815 while ($RELOAD) {
3595 warn "reloading..."; 3816 warn "reloading...";
3596 3817
3597 warn "entering sync_job"; 3818 warn "entering sync_job";
3598 3819
3599 cf::sync_job { 3820 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3821 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3822 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3823 cf::write_runtime_sync; # external watchdog should not bark
3603 3824
3604 warn "syncing database to disk"; 3825 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3827
3607 # if anything goes wrong in here, we should simply crash as we already saved 3828 # if anything goes wrong in here, we should simply crash as we already saved
3608 3829
3609 warn "flushing outstanding aio requests"; 3830 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3831 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3833 }
3641 3834
3642 warn "... nuking $pkg"; 3835 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3836 $_->cancel for values %EXT_CORO;
3644 } 3837 %EXT_CORO = ();
3645 3838
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3839 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3840 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3841
3842 warn "removing ext/exti commands";
3843 %EXTCMD = ();
3844 %EXTICMD = ();
3845
3846 warn "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3848 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3849
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3850 if (my $cb = $pkg->can ("unload")) {
3851 eval {
3657 $cb->(); 3852 $cb->($pkg);
3853 1
3854 } or warn "$pkg unloaded, but with errors: $@";
3855 }
3856
3857 warn "... clearing $pkg";
3858 clear_package $pkg;
3658 } 3859 }
3659 3860
3660 Symbol::delete_package $k; 3861 warn "unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864
3865 warn "... unloading $k";
3866 delete $INC{$k};
3867
3868 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g;
3870
3871 if (my $cb = $k->can ("unload_module")) {
3872 $cb->();
3873 }
3874
3875 clear_package $k;
3661 } 3876 }
3662 3877
3663 warn "getting rid of safe::, as good as possible"; 3878 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3879 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3881
3667 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3885
3671 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3887 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3674 3889
3675 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3676 3891
3677 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3678 require cf; 3893 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3680 3895
3681 warn "loading config and database again"; 3896 warn "loading config and database again";
3682 cf::reload_config; 3897 cf::reload_config;
3683 3898
3684 warn "loading extensions"; 3899 warn "loading extensions";
3685 cf::load_extensions; 3900 cf::load_extensions;
3686 3901
3902 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3693 3910
3911 warn "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913
3694 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3695 3915
3696 1 3916 1
3697 } or do { 3917 } or do {
3698 warn $@; 3918 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3919 cf::cleanup "error while reloading, exiting.";
3700 }; 3920 };
3701 3921
3702 warn "reloaded"; 3922 warn "reloaded";
3923 --$RELOAD;
3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3703}; 3928};
3704 3929
3705our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3706 3931
3707sub reload_perl() { 3932sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3710 3935
3936 $RELOAD_WATCHER ||= cf::async {
3937 Coro::AIO::aio_wait cache_extensions;
3938
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3940 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3942 };
3714 }; 3943 };
3715} 3944}
3716 3945
3717register_command "reload" => sub { 3946register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3732 3961
3733our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3735 3964
3736sub wait_for_tick { 3965sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3967
3739 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3970 $signal->wait;
3742} 3971}
3743 3972
3744sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3975
3747 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3978 $signal->wait;
3750} 3979}
3755 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3756 return; 3985 return;
3757 } 3986 }
3758 3987
3759 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3989
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 3991
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3994 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
3787} 4018}
3788 4019
3789{ 4020{
3790 # configure BDB 4021 # configure BDB
3791 4022
3792 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3795 4026
3796 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4030 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4031 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4033 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4034
3803 cf::sync_job { 4035 cf::sync_job {
3804 eval { 4036 eval {
3830{ 4062{
3831 # configure IO::AIO 4063 # configure IO::AIO
3832 4064
3833 IO::AIO::min_parallel 8; 4065 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4066 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4067 undef $AnyEvent::AIO::WATCHER;
3836} 4068}
3837 4069
3838my $_log_backtrace; 4070my $_log_backtrace;
3839 4071
3840sub _log_backtrace { 4072sub _log_backtrace {
3843 $msg =~ s/\n//; 4075 $msg =~ s/\n//;
3844 4076
3845 # limit the # of concurrent backtraces 4077 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4078 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4079 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg;
3848 async { 4081 async {
3849 $Coro::current->{desc} = "abt $msg"; 4082 $Coro::current->{desc} = "abt $msg";
3850 4083
3851 my @bt = fork_call { 4084 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4085 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4096 }
3864 4097
3865 @funcs 4098 @funcs
3866 }; 4099 };
3867 4100
3868 LOG llevInfo, "[ABT] $msg\n"; 4101 LOG llevInfo, "[ABT] $perl_bt\n";
4102 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4103 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4104 --$_log_backtrace;
3871 }; 4105 };
3872 } else { 4106 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4107 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4109 }
3876} 4110}
3877 4111
3878# load additional modules 4112# load additional modules
3879use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3880 4115
3881END { cf::emergency_save } 4116END { cf::emergency_save }
3882 4117
3883evthread_start IO::AIO::poll_fileno;
3884
38851 41181
3886 4119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines