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.429 by root, Sat May 3 15:17:13 2008 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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.50 (); 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;
93 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 118our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
99 120
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 124our $DB_ENV;
105 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
106our %CFG; 128our %CFG;
107 129
108our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 131our $RUNTIME;
110our $NOW; 132our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 143our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 151binmode STDOUT;
125binmode STDERR; 152binmode STDERR;
126 153
127# read virtual server time, if available 154# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
132} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
133 162
134mkdir $_ 163mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 165
137our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
138 167
139sub 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::"} };
140 184
141############################################################################# 185#############################################################################
142 186
143=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
144 188
191returns 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
192per 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.
193 237
194=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
195 239
196This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 242that call.
199 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
200=back 250=back
201 251
202=cut 252=cut
203 253
204BEGIN { 254$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 255 my $msg = join "", @_;
207 256
208 $msg .= "\n" 257 $msg .= "\n"
209 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
210 259
211 $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;
212 261
213 LOG llevError, $msg; 262 LOG llevError, $msg;
214 }; 263};
215}
216 264
217$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
219 267
220 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 272 return;#d#
223 }#d# 273 }#d#
224 274
225 # kill coroutine otherwise 275 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 276 Coro::terminate
228}; 277};
229
230$SIG{__DIE__} = sub { }; #d#?
231 278
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 289for my $pkg (qw(
243 cf::global cf::attachable 290 cf::global cf::attachable
244 cf::object cf::object::player 291 cf::object cf::object::player
245 cf::client cf::player 292 cf::client cf::player
246 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
247 cf::map cf::party cf::region 295 cf::party cf::region
248)) { 296)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 298}
252 299
253$EV::DIED = sub { 300$EV::DIED = sub {
254 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
255}; 302};
256 303
257############################################################################# 304#############################################################################
258 305
259=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
296our $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
297 344
298sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 362=item cf::lock_wait $string
302 363
303Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
304 365
305=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
306 367
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
310returned. 371returned.
311 372
312Locks 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
313deadlocked coro. 374deadlocked coro.
319 380
320Return 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.
321 382
322=cut 383=cut
323 384
324our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 386
327sub lock_wait($) { 387sub lock_wait($) {
328 my ($key) = @_; 388 $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} 389}
341 390
342sub lock_acquire($) { 391sub lock_acquire($) {
343 my ($key) = @_; 392 $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} 393}
357 394
358sub lock_active($) { 395sub lock_active($) {
359 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 397}
363 398
364sub freeze_mainloop { 399sub freeze_mainloop {
365 tick_inhibit_inc; 400 tick_inhibit_inc;
366 401
367 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
368} 403}
369 404
370=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
371 406
372Like 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
373get spread over timer. 408get spread over time.
374 409
375=cut 410=cut
376 411
377sub periodic($$) { 412sub periodic($$) {
378 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
395 430
396=cut 431=cut
397 432
398our @SLOT_QUEUE; 433our @SLOT_QUEUE;
399our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
400 436
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
404 440
405 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
406 443
407 while () { 444 while () {
408 next_job: 445 next_job:
446
409 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 448
411 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 453 $job->[2]->send;
415 Coro::cede; 454 Coro::cede;
416 goto next_job; 455 goto next_job;
417 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 458 }
419 } 459 }
420 460
421 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 464 $signal->wait;
425 } else { 465 } else {
466 $busy = 0;
426 Coro::schedule; 467 Coro::schedule;
427 } 468 }
428 } 469 }
429}; 470};
430 471
431sub get_slot($;$$) { 472sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
433 474
434 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
435 476
436 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
437 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
438 480
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
468 510
469sub sync_job(&) { 511sub sync_job(&) {
470 my ($job) = @_; 512 my ($job) = @_;
471 513
472 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
473 my $time = EV::time; 515 my $time = AE::time;
474 516
475 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
477 519
478 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
495 } else { 537 } else {
496 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
497 } 539 }
498 } 540 }
499 541
500 my $time = EV::time - $time; 542 my $time = AE::time - $time;
501 543
502 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
503 545
504 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
505 } else { 547 } else {
549 reset_signals; 591 reset_signals;
550 &$cb 592 &$cb
551 }, @args; 593 }, @args;
552 594
553 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 )
554} 607}
555 608
556=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
557 610
558=cut 611=cut
724 777
725############################################################################# 778#############################################################################
726 779
727=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
728 781
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
732 785
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
785 838
786Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
788 841
789Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 844
792These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
793 846
794=over 4 847=over 4
1085 1138
1086sub reattach { 1139sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1141 my ($obj) = @_;
1089 1142
1143 # no longer needed after getting rid of delete_package?
1090 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
1091 1145
1092 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1093 1147
1094 @$registry = (); 1148 @$registry = ();
1095 1149
1143 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1144 1198
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 aio_close $fh; 1206 aio_close $fh;
1150 1207
1151 if (@$objs) { 1208 if (@$objs) {
1152 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) {
1153 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 aio_close $fh; 1217 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1219 }
1160 } else { 1220 } else {
1161 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1162 } 1222 }
1163 1223
1164 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1228 } else {
1166 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1167 } 1230 }
1168 } else { 1231 } else {
1169 aio_unlink $filename; 1232 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1171 } 1234 }
1262 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1263 1326
1264 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1265} 1328}
1266 1329
1330use File::Glob ();
1331
1267cf::player->attach ( 1332cf::player->attach (
1268 on_command => sub { 1333 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1270 1335
1271 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1272 or return; 1337 or return;
1273 1338
1303 1368
1304 cf::override; 1369 cf::override;
1305 }, 1370 },
1306); 1371);
1307 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
1308sub load_extensions { 1386sub load_extensions {
1309 cf::sync_job { 1387 cf::sync_job {
1310 my %todo; 1388 my %todo;
1311 1389
1312 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1331 1409
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1412
1335 $ext{source} = 1413 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1338 . $source 1416 . $source
1339 . "\n};\n1"; 1417 . "\n};\n1";
1340 1418
1341 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1342 } 1420 }
1343 1421
1422 my $pass = 0;
1344 my %done; 1423 my %done;
1345 while (%todo) { 1424 while (%todo) {
1346 my $progress; 1425 my $progress;
1347 1426
1427 ++$pass;
1428
1429 ext:
1348 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1432 next ext
1351 unless exists $done{$_}; 1433 unless exists $done{$_};
1352 } 1434 }
1353 1435
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1437
1356 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1442
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1444 if exists $v->{meta}{mandatory};
1364 1445
1365 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;
1366 } 1455 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1456 }
1372 1457
1373 skip: 1458 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1466 }
1377 }; 1467 };
1378} 1468}
1379 1469
1380############################################################################# 1470#############################################################################
1381 1471
1382=back 1472=back
1383 1473
1384=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1385 1475
1386Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1387 1477
1388=cut 1478=cut
1389 1479
1390package cf::player; 1480package cf::player;
1391 1481
1434 1524
1435sub exists($) { 1525sub exists($) {
1436 my ($login) = @_; 1526 my ($login) = @_;
1437 1527
1438 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1440} 1530}
1441 1531
1442sub find($) { 1532sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1534 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1465 } 1555 }
1466 } 1556 }
1467} 1557}
1468 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
1469sub save($) { 1572sub save($) {
1470 my ($pl) = @_; 1573 my ($pl) = @_;
1471 1574
1472 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1473 1576
1478 1581
1479 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1481 1584
1482 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];
1483 1589
1484 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1591 cf::cede_to_tick;
1486} 1592}
1487 1593
1519 my ($pl) = @_; 1625 my ($pl) = @_;
1520 1626
1521 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1522 1628
1523 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1524 $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
1525 1631
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1530 1638
1531 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1613 } 1721 }
1614 1722
1615 \@paths 1723 \@paths
1616} 1724}
1617 1725
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1727
1620Expand crossfire pod fragments into protocol xml. 1728Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1729
1711=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1712 1731
1713Sends an ext reply to the player. 1732Sends an ext reply to the player.
1714 1733
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1807
1789 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1809 $self->_create_random_map (
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1927 1946
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1930} 1949}
1931 1950
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1951sub decay_objects {
1942 my ($self) = @_; 1952 my ($self) = @_;
1943 1953
1944 return if $self->{deny_reset}; 1954 return if $self->{deny_reset};
1945 1955
2027sub find { 2037sub find {
2028 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
2029 2039
2030 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
2031 2041
2032 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2044
2035 $cf::MAP{$path} || do { 2045 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 2046 my $map = new_from_path cf::map $path
2040 or return; 2047 or return;
2041 2048
2042 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
2043 2050
2055 2062
2056 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2057 } 2064 }
2058} 2065}
2059 2066
2060sub pre_load { } 2067sub pre_load { }
2061sub post_load { } 2068#sub post_load { } # XS
2062 2069
2063sub load { 2070sub load {
2064 my ($self) = @_; 2071 my ($self) = @_;
2065 2072
2066 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2090 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2091 $f->skip_block;
2085 $self->_load_objects ($f) 2092 $self->_load_objects ($f)
2086 or return; 2093 or return;
2087 2094
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2095 $self->post_load_original
2089 if delete $self->{load_original}; 2096 if delete $self->{load_original};
2090 2097
2091 if (my $uniq = $self->uniq_path) { 2098 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2099 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2100 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2119 $self->decay_objects;
2113 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2114 $self->update_buttons; 2121 $self->update_buttons;
2115 cf::cede_to_tick; 2122 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2123 $self->activate;
2119 } 2124 }
2120 2125
2121 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2125 } 2130 }
2126 2131
2127 $self->post_load; 2132 $self->post_load;
2128} 2133}
2129 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2130sub customise_for { 2138sub customise_for {
2131 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2132 2140
2133 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2142 if $self->per_player;
2211 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2212 2220
2213 () 2221 ()
2214} 2222}
2215 2223
2224# common code, used by both ->save and ->swapout
2216sub save { 2225sub _save {
2217 my ($self) = @_; 2226 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2227
2221 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2222 2229
2223 return unless $self->dirty; 2230 return unless $self->dirty;
2224 2231
2244 } else { 2251 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2253 }
2247} 2254}
2248 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2249sub swap_out { 2264sub swap_out {
2250 my ($self) = @_; 2265 my ($self) = @_;
2251 2266
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2268
2257 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2259 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2260 2272
2261 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2262
2263 $self->deactivate; 2274 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2265 $self->clear; 2282 $self->clear;
2266} 2283}
2267 2284
2268sub reset_at { 2285sub reset_at {
2269 my ($self) = @_; 2286 my ($self) = @_;
2288 2305
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2307
2291 return if $self->players; 2308 return if $self->players;
2292 2309
2293 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2294 2311
2295 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2296 2313
2297 # need to save uniques path 2314 # need to save uniques path
2298 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2389 : normalise $_ 2406 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2408 ]
2392} 2409}
2393 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2394=back 2443=back
2395 2444
2396=head3 cf::object 2445=head3 cf::object
2397 2446
2398=cut 2447=cut
2463 2512
2464our $SAY_CHANNEL = { 2513our $SAY_CHANNEL = {
2465 id => "say", 2514 id => "say",
2466 title => "Map", 2515 title => "Map",
2467 reply => "say ", 2516 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2518};
2470 2519
2471our $CHAT_CHANNEL = { 2520our $CHAT_CHANNEL = {
2472 id => "chat", 2521 id => "chat",
2473 title => "Chat", 2522 title => "Chat",
2528 2577
2529=item $player_object->enter_link 2578=item $player_object->enter_link
2530 2579
2531Freezes the player and moves him/her to a special map (C<{link}>). 2580Freezes the player and moves him/her to a special map (C<{link}>).
2532 2581
2533The player should be reasonably safe there for short amounts of time. You 2582The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2583for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link
2585map.
2535 2586
2536Will never block. 2587Will never block.
2537 2588
2538=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2539 2590
2564 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2565 2616
2566 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2567 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2568 2619
2569 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2570} 2621}
2571 2622
2572sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2573 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2574 2625
2591 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2593 2644
2594 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2597 2648
2598 $map->load; 2649 $map->load;
2599 $map->load_neighbours; 2650 $map->load_neighbours;
2600 2651
2601 return unless $self->contr->active; 2652 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2653
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2606} 2659}
2607 2660
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2609 2662
2610Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2664her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2665that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2666the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2667be called at the end of this process.
2668
2669Note that $check will be called with a potentially non-loaded map, so if
2670it needs a loaded map it has to call C<< ->load >>.
2615 2671
2616=cut 2672=cut
2617 2673
2618our $GOTOGEN; 2674our $GOTOGEN;
2619 2675
2698} 2754}
2699 2755
2700sub prepare_random_map { 2756sub prepare_random_map {
2701 my ($exit) = @_; 2757 my ($exit) = @_;
2702 2758
2703 my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705 # all this does is basically replace the /! path by 2759 # all this does is basically replace the /! path by
2706 # a new random map path (?random/...) with a seed 2760 # a new random map path (?random/...) with a seed
2707 # that depends on the exit object 2761 # that depends on the exit object
2708 2762
2709 my $rmp = parse_random_map_params $exit->msg; 2763 my $rmp = parse_random_map_params $exit->msg;
2711 if ($exit->map) { 2765 if ($exit->map) {
2712 $rmp->{region} = $exit->region->name; 2766 $rmp->{region} = $exit->region->name;
2713 $rmp->{origin_map} = $exit->map->path; 2767 $rmp->{origin_map} = $exit->map->path;
2714 $rmp->{origin_x} = $exit->x; 2768 $rmp->{origin_x} = $exit->x;
2715 $rmp->{origin_y} = $exit->y; 2769 $rmp->{origin_y} = $exit->y;
2770
2771 $exit->map->touch;
2716 } 2772 }
2717 2773
2718 $rmp->{random_seed} ||= $exit->random_seed; 2774 $rmp->{random_seed} ||= $exit->random_seed;
2719 2775
2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2776 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2780 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2725 aio_write $fh, 0, (length $data), $data, 0; 2781 aio_write $fh, 0, (length $data), $data, 0;
2726 undef $fh; 2782 undef $fh;
2727 aio_rename "$meta~", $meta; 2783 aio_rename "$meta~", $meta;
2728 2784
2785 my $slaying = "?random/$md5";
2786
2787 if ($exit->valid) {
2729 $exit->slaying ("?random/$md5"); 2788 $exit->slaying ("?random/$md5");
2730 $exit->msg (undef); 2789 $exit->msg (undef);
2790 }
2731 } 2791 }
2732} 2792}
2733 2793
2734sub cf::object::player::enter_exit { 2794sub cf::object::player::enter_exit {
2735 my ($self, $exit) = @_; 2795 my ($self, $exit) = @_;
2736 2796
2737 return unless $self->type == cf::PLAYER; 2797 return unless $self->type == cf::PLAYER;
2738 2798
2739 if ($exit->slaying eq "/!") {
2740 #TODO: this should de-fi-ni-te-ly not be a sync-job
2741 # the problem is that $exit might not survive long enough
2742 # so it needs to be done right now, right here
2743 cf::sync_job { prepare_random_map $exit };
2744 }
2745
2746 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747 my $hp = $exit->stats->hp;
2748 my $sp = $exit->stats->sp;
2749
2750 $self->enter_link; 2799 $self->enter_link;
2751 2800
2752 # if exit is damned, update players death & WoR home-position
2753 $self->contr->savebed ($slaying, $hp, $sp)
2754 if $exit->flag (FLAG_DAMNED);
2755
2756 (async { 2801 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2802 $Coro::current->{desc} = "enter_exit";
2758 2803
2759 $self->deactivate_recursive; # just to be sure
2760 unless (eval { 2804 unless (eval {
2805 $self->deactivate_recursive; # just to be sure
2806
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2816 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp;
2818
2761 $self->goto ($slaying, $hp, $sp); 2819 $self->goto ($map, $x, $y);
2762 2820
2821 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y)
2823 if $exit->flag (cf::FLAG_DAMNED);
2824
2763 1; 2825 1
2764 }) { 2826 }) {
2765 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2766 . "I'll try to bring you back to the map you were before. " 2828 . "I'll try to bring you back to the map you were before. "
2767 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2768 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2769 2831
2770 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
2787sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2788 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2789 2851
2790 utf8::encode $text; 2852 utf8::encode $text;
2791 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2854}
2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2792} 2879}
2793 2880
2794=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2795 2882
2796Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2800 2887
2801=cut 2888=cut
2802 2889
2803# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2804our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2805 "c/identify" => { 2898 "c/identify" => {
2806 id => "infobox", 2899 id => "infobox",
2807 title => "Identify", 2900 title => "Identify",
2808 reply => undef, 2901 reply => undef,
2809 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2811 "c/examine" => { 2904 "c/examine" => {
2812 id => "infobox", 2905 id => "infobox",
2813 title => "Examine", 2906 title => "Examine",
2814 reply => undef, 2907 reply => undef,
2815 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2816 }, 2915 },
2817 "c/book" => { 2916 "c/book" => {
2818 id => "infobox", 2917 id => "infobox",
2819 title => "Book", 2918 title => "Book",
2820 reply => undef, 2919 reply => undef,
2836 id => "infobox", 2935 id => "infobox",
2837 title => "Body Parts", 2936 title => "Body Parts",
2838 reply => undef, 2937 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2840 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2946 "c/skills" => {
2947 id => "infobox",
2948 title => "Skills",
2949 reply => undef,
2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2841 "c/uptime" => { 2976 "c/uptime" => {
2842 id => "infobox", 2977 id => "infobox",
2843 title => "Uptime", 2978 title => "Uptime",
2844 reply => undef, 2979 reply => undef,
2845 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
2854 id => "party", 2989 id => "party",
2855 title => "Party", 2990 title => "Party",
2856 reply => "gsay ", 2991 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party", 2992 tooltip => "Messages and chat related to your party",
2858 }, 2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2859); 3002);
2860 3003
2861sub cf::client::send_msg { 3004sub cf::client::send_msg {
2862 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2863 3006
2864 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2865 3009
2866 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2867 3011
2868 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2869 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2871 3015
2872 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2876 3018
2877 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2878 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2879 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2880 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2881 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883 } 3024 }
2884 3025
2885 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2886 } 3027 }
2887 3028
2888 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2889 3030
2890 if ($self->can_msg) {
2891 # default colour, mask it out 3031 # default colour, mask it out
2892 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2893 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2894 3034
2895 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2896 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2897 } else { 3038 );
2898 if ($color >= 0) {
2899 # replace some tags by gcfclient-compatible ones
2900 for ($msg) {
2901 1 while
2902 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2903 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2904 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2905 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2906 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2907 }
2908 3039
2909 $color &= cf::NDI_COLOR_MASK; 3040 $self->send_big_packet ($pkt);
2910
2911 utf8::encode $msg;
2912
2913 if (0 && $msg =~ /\[/) {
2914 # COMMAND/INFO
2915 $self->send_packet ("drawextinfo $color 10 8 $msg")
2916 } else {
2917 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2918 $self->send_packet ("drawinfo $color $msg")
2919 }
2920 }
2921 }
2922} 3041}
2923 3042
2924=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2925 3044
2926Sends an ext event to the client. 3045Sends an ext event to the client.
2929 3048
2930sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2931 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2932 3051
2933 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2934 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2935 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2936 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2937 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2938 } 3057 }
2939} 3058}
2940 3059
2941=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2942 3061
2946 3065
2947sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2948 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2949 3068
2950 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2952 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2953 #TODO: version 1, remove 3072 #TODO: version 1, remove
2954 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2955 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2956 } 3075 }
2957} 3076}
2958 3077
2959=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2960 3079
3061 3180
3062 $coro 3181 $coro
3063} 3182}
3064 3183
3065cf::client->attach ( 3184cf::client->attach (
3066 on_destroy => sub { 3185 on_client_destroy => sub {
3067 my ($ns) = @_; 3186 my ($ns) = @_;
3068 3187
3069 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3070 }, 3189 },
3071); 3190);
3087our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3088 3207
3089$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3090 3209
3091$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3092 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3093 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3094 sort time 3213 sort time
3095)); 3214));
3096 3215
3097# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3101The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3102 3221
3103 cf::object 3222 cf::object
3104 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3105 insert remove name archname title slaying race decrease split 3224 insert remove name archname title slaying race decrease split
3225 value
3106 3226
3107 cf::object::player 3227 cf::object::player
3108 player 3228 player
3109 3229
3110 cf::player 3230 cf::player
3115 3235
3116=cut 3236=cut
3117 3237
3118for ( 3238for (
3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120 insert remove inv name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3121 decrease split destroy)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3122 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3123 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3124 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3125) { 3245) {
3126 no strict 'refs'; 3246 no strict 'refs';
3127 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3128 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3146 3266
3147 my $qcode = $code; 3267 my $qcode = $code;
3148 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3149 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3150 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3151 local $_; 3274 local $_;
3152 local @safe::cf::_safe_eval_args = values %vars;
3153 3275
3154 my $eval = 3276 my $eval =
3155 "do {\n" 3277 "do {\n"
3156 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3157 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3158 . $code 3280 . $code
3159 . "\n}" 3281 . "\n}"
3160 ; 3282 ;
3161 3283
3284 if ($CFG{safe_eval}) {
3162 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3163 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3164 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3165 3293
3166 if ($@) { 3294 if ($@) {
3167 warn "$@"; 3295 warn "$@";
3168 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3169 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3188=cut 3316=cut
3189 3317
3190sub register_script_function { 3318sub register_script_function {
3191 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3192 3320
3193 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3194 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3195} 3323}
3196 3324
3197=back 3325=back
3198 3326
3199=cut 3327=cut
3220 3348
3221 $facedata->{version} == 2 3349 $facedata->{version} == 2
3222 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3223 3351
3224 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3225 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3226 type => FT_RSRC, 3355 type => FT_RSRC,
3227 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3228 }; 3358 };
3229 cf::cede_to_tick; 3359 cf::cede_to_tick;
3230 3360
3231 { 3361 {
3232 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3234 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3235 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236 3366
3237 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3238 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3241 3371
3242 cf::cede_to_tick; 3372 cf::cede_to_tick;
3243 } 3373 }
3244 3374
3245 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3269 3399
3270 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3271 } 3401 }
3272 3402
3273 { 3403 {
3274 # TODO: for gcfclient pleasure, we should give resources
3275 # that gcfclient doesn't grok a >10000 face index.
3276 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3277 3405
3278 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3280 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3281 my $data;
3282 3409
3283 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3284 # prepend meta info
3285
3286 my $meta = $enc->encode ({
3287 name => $name,
3288 %{ $info->{meta} || {} },
3289 });
3290
3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3298 } else { 3412 } else {
3299 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3300 } 3414 }
3301 3415
3384 reload_treasures; 3498 reload_treasures;
3385 3499
3386 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3387} 3501}
3388 3502
3389sub init {
3390 my $guard = freeze_mainloop;
3391
3392 reload_resources;
3393}
3394
3395sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3397 or return; 3507 or return;
3398 3508
3399 local $/; 3509 local $/;
3400 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3401 3511
3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3403 3513
3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3409 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3410 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3411 }; 3521 };
3412 warn $@ if $@; 3522 warn $@ if $@;
3413 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3526}
3527
3528sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!";
3531 flock $fh, &Fcntl::LOCK_EX
3532 or die "$PIDFILE: flock: $!";
3533 $fh
3534}
3535
3536# make sure only one server instance is running at any one time
3537sub atomic {
3538 my $fh = pidfile;
3539
3540 my $pid = <$fh>;
3541 kill 9, $pid if $pid > 0;
3542
3543 seek $fh, 0, 0;
3544 print $fh $$;
3545}
3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3414} 3554}
3415 3555
3416sub main { 3556sub main {
3557 cf::init_globals; # initialise logging
3558
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565
3417 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3418 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3420 (async { 3569 (async {
3421 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT; 3571 EV::loop EV::LOOP_ONESHOT;
3423 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3424 }; 3573 };
3425 3574
3426 { 3575 evthread_start IO::AIO::poll_fileno;
3427 my $guard = freeze_mainloop; 3576
3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3586 reload_resources;
3428 reload_config; 3587 reload_config;
3429 db_init; 3588 db_init;
3589
3590 cf::init_uuid;
3591 cf::init_signals;
3592 cf::init_skills;
3593
3594 cf::init_beforeplay;
3595
3596 atomic;
3597
3430 load_extensions; 3598 load_extensions;
3431 3599
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 utime time, time, $RUNTIMEFILE;
3433 evthread_start IO::AIO::poll_fileno; 3601
3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605
3606 (pop @POST_INIT)->(0) while @POST_INIT;
3434 } 3607 };
3435 3608
3436 EV::loop; 3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3437} 3613}
3438 3614
3439############################################################################# 3615#############################################################################
3440# initialisation and cleanup 3616# initialisation and cleanup
3441 3617
3442# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3443BEGIN { 3619BEGIN {
3444 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3445 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3446 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3447 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3448 }; 3624 };
3449 } 3625 }
3450} 3626}
3451 3627
3452sub write_runtime_sync { 3628sub write_runtime_sync {
3453 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3454 3630
3455 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3456 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3457 3633
3458 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3459 3635
3460 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3461 3637
3462 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3463 or return; 3639 or return;
3464 3640
3465 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3466 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3467 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3477 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3478 3654
3479 close $fh 3655 close $fh
3480 or return; 3656 or return;
3481 3657
3482 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3483 and return; 3659 and return;
3484 3660
3485 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3486 3662
3487 1 3663 1
3488} 3664}
3489 3665
3490our $uuid_lock; 3666our $uuid_lock;
3499 my $uuid = "$LOCALDIR/uuid"; 3675 my $uuid = "$LOCALDIR/uuid";
3500 3676
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return; 3678 or return;
3503 3679
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3680 my $value = uuid_seq uuid_cur;
3681
3682 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n";
3684 return;
3685 }
3686
3687 my $value = uuid_str $value + $uuid_skip;
3505 $uuid_skip = 0; 3688 $uuid_skip = 0;
3506 3689
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return; 3691 and return;
3509 3692
3531} 3714}
3532 3715
3533sub emergency_save() { 3716sub emergency_save() {
3534 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3535 3718
3536 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3537 3720
3538 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3539 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3540 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3541 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3542 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3543 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3544 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3545 $pl->valid or next; 3733 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3547 $pl->save; 3735 $pl->save;
3548 } 3736 }
3549 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3550 3738
3551 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3552 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3553 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3554 $map->valid or next; 3742 $map->valid or next;
3555 $map->save; 3743 $map->save;
3556 } 3744 }
3557 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3558 3746
3559 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3560 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3561 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3562 3750
3563 warn "begin write uuid\n"; 3751 warn "emergency_perl_save: begin write uuid\n";
3564 write_uuid_sync 1; 3752 write_uuid_sync 1;
3565 warn "end write uuid\n"; 3753 warn "emergency_perl_save: end write uuid\n";
3566 }; 3754 };
3567 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3568 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3569} 3762}
3570 3763
3571sub post_cleanup { 3764sub post_cleanup {
3572 my ($make_core) = @_; 3765 my ($make_core) = @_;
3573 3766
3574 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3575 if $make_core; 3768 if $make_core;
3769
3770 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$;
3772}
3773
3774# a safer delete_package, copied from Symbol
3775sub clear_package($) {
3776 my $pkg = shift;
3777
3778 # expand to full symbol table name if needed
3779 unless ($pkg =~ /^main::.*::$/) {
3780 $pkg = "main$pkg" if $pkg =~ /^::/;
3781 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3782 $pkg .= '::' unless $pkg =~ /::$/;
3783 }
3784
3785 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3786 my $stem_symtab = *{$stem}{HASH};
3787
3788 defined $stem_symtab and exists $stem_symtab->{$leaf}
3789 or return;
3790
3791 # clear all symbols
3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3793 for my $name (keys %$leaf_symtab) {
3794 _gv_clear *{"$pkg$name"};
3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3796 }
3576} 3797}
3577 3798
3578sub do_reload_perl() { 3799sub do_reload_perl() {
3579 # can/must only be called in main 3800 # can/must only be called in main
3580 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3581 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3582 return; 3803 return;
3583 } 3804 }
3584 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3585 warn "reloading..."; 3811 warn "reloading...";
3586 3812
3587 warn "entering sync_job"; 3813 warn "entering sync_job";
3588 3814
3589 cf::sync_job { 3815 cf::sync_job {
3590 cf::write_runtime_sync; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3591 cf::emergency_save; 3817 cf::emergency_save;
3592 cf::write_runtime_sync; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3593 3819
3594 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3595 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3596 3822
3597 # if anything goes wrong in here, we should simply crash as we already saved 3823 # if anything goes wrong in here, we should simply crash as we already saved
3598 3824
3599 warn "flushing outstanding aio requests"; 3825 warn "flushing outstanding aio requests";
3600 for (;;) {
3601 BDB::flush;
3602 IO::AIO::flush;
3603 Coro::cede_notself;
3604 last unless IO::AIO::nreqs || BDB::nreqs; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3605 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3606 }
3607
3608 ++$RELOAD;
3609
3610 warn "cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = ();
3613
3614 warn "removing commands";
3615 %COMMAND = ();
3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg";
3624
3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 } 3828 }
3631 3829
3632 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3633 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3634 } 3832 %EXT_CORO = ();
3635 3833
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3637 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3640 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3641 delete $INC{$k};
3642 3844
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3647 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3648 } 3854 }
3649 3855
3650 Symbol::delete_package $k; 3856 warn "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859
3860 warn "... unloading $k";
3861 delete $INC{$k};
3862
3863 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g;
3865
3866 if (my $cb = $k->can ("unload_module")) {
3867 $cb->();
3868 }
3869
3870 clear_package $k;
3651 } 3871 }
3652 3872
3653 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3654 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3876
3657 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3880
3661 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3882 # and global variables created in xs
3663 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3664 3884
3665 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3666 3886
3667 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3668 require cf; 3888 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3670 3890
3671 warn "loading config and database again"; 3891 warn "loading config and database again";
3672 cf::reload_config; 3892 cf::reload_config;
3673 3893
3674 warn "loading extensions"; 3894 warn "loading extensions";
3675 cf::load_extensions; 3895 cf::load_extensions;
3676 3896
3897 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3683 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3684 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3685 3910
3686 1 3911 1
3687 } or do { 3912 } or do {
3688 warn $@; 3913 warn $@;
3689 cf::cleanup "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3690 }; 3915 };
3691 3916
3692 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3693}; 3923};
3694 3924
3695our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3696 3926
3697sub reload_perl() { 3927sub reload_perl() {
3698 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3699 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3700 3930
3931 $RELOAD_WATCHER ||= cf::async {
3932 Coro::AIO::aio_wait cache_extensions;
3933
3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3702 do_reload_perl; 3935 do_reload_perl;
3703 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3937 };
3704 }; 3938 };
3705} 3939}
3706 3940
3707register_command "reload" => sub { 3941register_command "reload" => sub {
3708 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3722 3956
3723our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3724our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3725 3959
3726sub wait_for_tick { 3960sub wait_for_tick {
3727 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3728 3962
3729 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3730 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3731 $signal->wait; 3965 $signal->wait;
3732} 3966}
3733 3967
3734sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3735 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3736 3970
3737 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3738 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3739 $signal->wait; 3973 $signal->wait;
3740} 3974}
3745 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3746 return; 3980 return;
3747 } 3981 }
3748 3982
3749 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3750 3986
3751 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3753 Coro::async_pool { 3989 Coro::async_pool {
3754 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3777} 4013}
3778 4014
3779{ 4015{
3780 # configure BDB 4016 # configure BDB
3781 4017
3782 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3783 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3784 $Coro::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3785 4021
3786 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3787 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3789 | BDB::LOG_AUTOREMOVE, 1); 4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4026 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4027 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4028 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3792 4029
3793 cf::sync_job { 4030 cf::sync_job {
3794 eval { 4031 eval {
3820{ 4057{
3821 # configure IO::AIO 4058 # configure IO::AIO
3822 4059
3823 IO::AIO::min_parallel 8; 4060 IO::AIO::min_parallel 8;
3824 IO::AIO::max_poll_time $TICK * 0.1; 4061 IO::AIO::max_poll_time $TICK * 0.1;
3825 $Coro::AIO::WATCHER->priority (1); 4062 undef $AnyEvent::AIO::WATCHER;
3826} 4063}
3827 4064
3828my $_log_backtrace; 4065my $_log_backtrace;
3829 4066
3830sub _log_backtrace { 4067sub _log_backtrace {
3833 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3834 4071
3835 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3836 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3837 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3838 async { 4076 async {
3839 $Coro::current->{desc} = "abt $msg"; 4077 $Coro::current->{desc} = "abt $msg";
3840 4078
3841 my @bt = fork_call { 4079 my @bt = fork_call {
3842 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3853 } 4091 }
3854 4092
3855 @funcs 4093 @funcs
3856 }; 4094 };
3857 4095
3858 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3859 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3860 --$_log_backtrace; 4099 --$_log_backtrace;
3861 }; 4100 };
3862 } else { 4101 } else {
3863 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3864 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3865 } 4104 }
3866} 4105}
3867 4106
3868# load additional modules 4107# load additional modules
3869use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3870 4110
3871END { cf::emergency_save } 4111END { cf::emergency_save }
3872 4112
38731 41131
3874 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines