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.523 by root, Sat Apr 17 02:39:46 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},
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
2266 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2267
2268 $self->deactivate; 2278 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2270 $self->clear; 2286 $self->clear;
2271} 2287}
2272 2288
2273sub reset_at { 2289sub reset_at {
2274 my ($self) = @_; 2290 my ($self) = @_;
2293 2309
2294 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295 2311
2296 return if $self->players; 2312 return if $self->players;
2297 2313
2298 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2299 2315
2300 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2301 2317
2302 # need to save uniques path 2318 # need to save uniques path
2303 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
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;
2611} 2663}
2612 2664
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2614 2666
2615Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2669that 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 2670the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2671be called at the end of this process.
2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2620 2675
2621=cut 2676=cut
2622 2677
2623our $GOTOGEN; 2678our $GOTOGEN;
2624 2679
2771 $self->contr->savebed ($map, $x, $y) 2826 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2827 if $exit->flag (cf::FLAG_DAMNED);
2773 2828
2774 1 2829 1
2775 }) { 2830 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2835
2781 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2798sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2800 2855
2801 utf8::encode $text; 2856 utf8::encode $text;
2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2803} 2883}
2804 2884
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 2886
2807Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2811 2891
2812=cut 2892=cut
2813 2893
2814# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2816 "c/identify" => { 2902 "c/identify" => {
2817 id => "infobox", 2903 id => "infobox",
2818 title => "Identify", 2904 title => "Identify",
2819 reply => undef, 2905 reply => undef,
2820 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2822 "c/examine" => { 2908 "c/examine" => {
2823 id => "infobox", 2909 id => "infobox",
2824 title => "Examine", 2910 title => "Examine",
2825 reply => undef, 2911 reply => undef,
2826 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2827 }, 2919 },
2828 "c/book" => { 2920 "c/book" => {
2829 id => "infobox", 2921 id => "infobox",
2830 title => "Book", 2922 title => "Book",
2831 reply => undef, 2923 reply => undef,
2847 id => "infobox", 2939 id => "infobox",
2848 title => "Body Parts", 2940 title => "Body Parts",
2849 reply => undef, 2941 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2851 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2852 "c/uptime" => { 2980 "c/uptime" => {
2853 id => "infobox", 2981 id => "infobox",
2854 title => "Uptime", 2982 title => "Uptime",
2855 reply => undef, 2983 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2865 id => "party", 2993 id => "party",
2866 title => "Party", 2994 title => "Party",
2867 reply => "gsay ", 2995 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2869 }, 2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2870); 3006);
2871 3007
2872sub cf::client::send_msg { 3008sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2874 3010
2875 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2876 3013
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 3015
2879 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2882 3019
2883 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2887 3022
2888 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 3028 }
2895 3029
2896 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2897 } 3031 }
2898 3032
2899 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2900 3034
2901 if ($self->can_msg) {
2902 # default colour, mask it out 3035 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2905 3038
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 3042 );
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 3043
2920 $color &= cf::NDI_COLOR_MASK; 3044 $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} 3045}
2934 3046
2935=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2936 3048
2937Sends an ext event to the client. 3049Sends an ext event to the client.
2940 3052
2941sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2943 3055
2944 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3061 }
2950} 3062}
2951 3063
2952=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2953 3065
2957 3069
2958sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2960 3072
2961 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove 3076 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 } 3079 }
2968} 3080}
2969 3081
2970=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2971 3083
3072 3184
3073 $coro 3185 $coro
3074} 3186}
3075 3187
3076cf::client->attach ( 3188cf::client->attach (
3077 on_destroy => sub { 3189 on_client_destroy => sub {
3078 my ($ns) = @_; 3190 my ($ns) = @_;
3079 3191
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3193 },
3082); 3194);
3098our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3099 3211
3100$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3101 3213
3102$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3105 sort time 3217 sort time
3106)); 3218));
3107 3219
3108# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3113 3225
3114 cf::object 3226 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3117 3230
3118 cf::object::player 3231 cf::object::player
3119 player 3232 player
3120 3233
3121 cf::player 3234 cf::player
3127=cut 3240=cut
3128 3241
3129for ( 3242for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["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 3244 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3136) { 3249) {
3137 no strict 'refs'; 3250 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3157 3270
3158 my $qcode = $code; 3271 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3161 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3162 local $_; 3278 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3279
3165 my $eval = 3280 my $eval =
3166 "do {\n" 3281 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3284 . $code
3170 . "\n}" 3285 . "\n}"
3171 ; 3286 ;
3172 3287
3288 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3176 3297
3177 if ($@) { 3298 if ($@) {
3178 warn "$@"; 3299 warn "$@";
3179 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3199=cut 3320=cut
3200 3321
3201sub register_script_function { 3322sub register_script_function {
3202 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3203 3324
3204 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3206} 3327}
3207 3328
3208=back 3329=back
3209 3330
3210=cut 3331=cut
3231 3352
3232 $facedata->{version} == 2 3353 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3355
3235 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3236 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC, 3359 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3239 }; 3362 };
3240 cf::cede_to_tick; 3363 cf::cede_to_tick;
3241 3364
3242 { 3365 {
3243 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3245 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3370
3248 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3252 3375
3253 cf::cede_to_tick; 3376 cf::cede_to_tick;
3254 } 3377 }
3255 3378
3256 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3280 3403
3281 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3282 } 3405 }
3283 3406
3284 { 3407 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3288 3409
3289 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3413
3294 if ($info->{type} & 1) { 3414 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}; 3415 cf::face::set_type $idx, $info->{type};
3309 } else { 3416 } else {
3310 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3311 } 3418 }
3312 3419
3395 reload_treasures; 3502 reload_treasures;
3396 3503
3397 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3398} 3505}
3399 3506
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3511 or return;
3409 3512
3410 local $/; 3513 local $/;
3411 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3412 3515
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3517
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $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}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3525 };
3423 warn $@ if $@; 3526 warn $@ if $@;
3424 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3425} 3558}
3426 3559
3427sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3428 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3573 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3435 }; 3577 };
3436 3578
3437 { 3579 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3439 reload_config; 3591 reload_config;
3440 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3441 load_extensions; 3602 load_extensions;
3442 3603
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3604 utime time, time, $RUNTIMEFILE;
3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3611 };
3445 3612
3446 EV::loop; 3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3447} 3617}
3448 3618
3449############################################################################# 3619#############################################################################
3450# initialisation and cleanup 3620# initialisation and cleanup
3451 3621
3452# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3453BEGIN { 3623BEGIN {
3454 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3458 }; 3628 };
3459 } 3629 }
3460} 3630}
3461 3631
3462sub write_runtime_sync { 3632sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3464 3634
3465 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3467 3637
3468 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3639
3470 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3471 3641
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3643 or return;
3474 3644
3475 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3488 3658
3489 close $fh 3659 close $fh
3490 or return; 3660 or return;
3491 3661
3492 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3663 and return;
3494 3664
3495 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3666
3497 1 3667 1
3498} 3668}
3499 3669
3500our $uuid_lock; 3670our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3510 3680
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3682 or return;
3513 3683
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3692 $uuid_skip = 0;
3516 3693
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3695 and return;
3519 3696
3541} 3718}
3542 3719
3543sub emergency_save() { 3720sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3545 3722
3546 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3547 3724
3548 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3549 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3737 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3739 $pl->save;
3558 } 3740 }
3559 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3560 3742
3561 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3746 $map->valid or next;
3565 $map->save; 3747 $map->save;
3566 } 3748 }
3567 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3568 3750
3569 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3572 3754
3573 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3756 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3576 }; 3758 };
3577 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3578 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3579} 3766}
3580 3767
3581sub post_cleanup { 3768sub post_cleanup {
3582 my ($make_core) = @_; 3769 my ($make_core) = @_;
3583 3770
3584 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3586} 3801}
3587 3802
3588sub do_reload_perl() { 3803sub do_reload_perl() {
3589 # can/must only be called in main 3804 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3591 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3592 return; 3807 return;
3593 } 3808 }
3594 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3595 warn "reloading..."; 3815 warn "reloading...";
3596 3816
3597 warn "entering sync_job"; 3817 warn "entering sync_job";
3598 3818
3599 cf::sync_job { 3819 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3821 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3603 3823
3604 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3826
3607 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3608 3828
3609 warn "flushing outstanding aio requests"; 3829 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; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3831 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 } 3832 }
3641 3833
3642 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3644 } 3836 %EXT_CORO = ();
3645 3837
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3848
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3657 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3658 } 3858 }
3659 3859
3660 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3661 } 3875 }
3662 3876
3663 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3880
3667 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3884
3671 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3886 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3674 3888
3675 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3676 3890
3677 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3678 require cf; 3892 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3680 3894
3681 warn "loading config and database again"; 3895 warn "loading config and database again";
3682 cf::reload_config; 3896 cf::reload_config;
3683 3897
3684 warn "loading extensions"; 3898 warn "loading extensions";
3685 cf::load_extensions; 3899 cf::load_extensions;
3686 3900
3901 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3693 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3694 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3695 3914
3696 1 3915 1
3697 } or do { 3916 } or do {
3698 warn $@; 3917 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3700 }; 3919 };
3701 3920
3702 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3703}; 3927};
3704 3928
3705our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3706 3930
3707sub reload_perl() { 3931sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3710 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3939 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3714 }; 3942 };
3715} 3943}
3716 3944
3717register_command "reload" => sub { 3945register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3732 3960
3733our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3735 3963
3736sub wait_for_tick { 3964sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3966
3739 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3969 $signal->wait;
3742} 3970}
3743 3971
3744sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3974
3747 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3977 $signal->wait;
3750} 3978}
3755 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3756 return; 3984 return;
3757 } 3985 }
3758 3986
3759 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 3990
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3993 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3787} 4017}
3788 4018
3789{ 4019{
3790 # configure BDB 4020 # configure BDB
3791 4021
3792 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3795 4025
3796 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4033
3803 cf::sync_job { 4034 cf::sync_job {
3804 eval { 4035 eval {
3830{ 4061{
3831 # configure IO::AIO 4062 # configure IO::AIO
3832 4063
3833 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4066 undef $AnyEvent::AIO::WATCHER;
3836} 4067}
3837 4068
3838my $_log_backtrace; 4069my $_log_backtrace;
3839 4070
3840sub _log_backtrace { 4071sub _log_backtrace {
3843 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3844 4075
3845 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3848 async { 4080 async {
3849 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3850 4082
3851 my @bt = fork_call { 4083 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4095 }
3864 4096
3865 @funcs 4097 @funcs
3866 }; 4098 };
3867 4099
3868 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4103 --$_log_backtrace;
3871 }; 4104 };
3872 } else { 4105 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4108 }
3876} 4109}
3877 4110
3878# load additional modules 4111# load additional modules
3879use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3880 4114
3881END { cf::emergency_save } 4115END { cf::emergency_save }
3882 4116
3883evthread_start IO::AIO::poll_fileno;
3884
38851 41171
3886 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines