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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.520 by root, Fri Apr 16 02:37:50 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
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 180
141############################################################################# 181#############################################################################
142 182
143=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
144 184
191returns directly I<after> the tick processing (and consequently, can only wake one process 231returns 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. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 233
194=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
195 235
196This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 238that call.
199 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
200=back 246=back
201 247
202=cut 248=cut
203 249
204BEGIN { 250$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 251 my $msg = join "", @_;
207 252
208 $msg .= "\n" 253 $msg .= "\n"
209 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
210 255
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 257
213 LOG llevError, $msg; 258 LOG llevError, $msg;
214 }; 259};
215}
216 260
217$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
219 265
220 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 268 return;#d#
223 }#d# 269 }#d#
224 270
225 # kill coroutine otherwise 271 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 272 Coro::terminate
228}; 273};
229
230$SIG{__DIE__} = sub { }; #d#?
231 274
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 285for my $pkg (qw(
243 cf::global cf::attachable 286 cf::global cf::attachable
244 cf::object cf::object::player 287 cf::object cf::object::player
245 cf::client cf::player 288 cf::client cf::player
246 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
247 cf::map cf::party cf::region 291 cf::party cf::region
248)) { 292)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 294}
252 295
253$EV::DIED = sub { 296$EV::DIED = sub {
254 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
255}; 298};
256 299
257############################################################################# 300#############################################################################
258 301
259=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 340
298sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
300 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
301=item cf::lock_wait $string 358=item cf::lock_wait $string
302 359
303Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
304 361
305=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
306 363
307Wait until the given lock is available and then acquires it and returns 364Wait 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, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
310returned. 367returned.
311 368
312Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 370deadlocked coro.
319 376
320Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
321 378
322=cut 379=cut
323 380
324our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 382
327sub lock_wait($) { 383sub lock_wait($) {
328 my ($key) = @_; 384 $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} 385}
341 386
342sub lock_acquire($) { 387sub lock_acquire($) {
343 my ($key) = @_; 388 $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} 389}
357 390
358sub lock_active($) { 391sub lock_active($) {
359 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 393}
363 394
364sub freeze_mainloop { 395sub freeze_mainloop {
365 tick_inhibit_inc; 396 tick_inhibit_inc;
366 397
367 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
368} 399}
369 400
370=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
371 402
372Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 404get spread over time.
374 405
375=cut 406=cut
376 407
377sub periodic($$) { 408sub periodic($$) {
378 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
395 426
396=cut 427=cut
397 428
398our @SLOT_QUEUE; 429our @SLOT_QUEUE;
399our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
400 432
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
404 436
405 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
406 439
407 while () { 440 while () {
408 next_job: 441 next_job:
442
409 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 444
411 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 449 $job->[2]->send;
415 Coro::cede; 450 Coro::cede;
416 goto next_job; 451 goto next_job;
417 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 454 }
419 } 455 }
420 456
421 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 460 $signal->wait;
425 } else { 461 } else {
462 $busy = 0;
426 Coro::schedule; 463 Coro::schedule;
427 } 464 }
428 } 465 }
429}; 466};
430 467
431sub get_slot($;$$) { 468sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
433 470
434 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
435 472
436 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
437 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
438 476
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
468 506
469sub sync_job(&) { 507sub sync_job(&) {
470 my ($job) = @_; 508 my ($job) = @_;
471 509
472 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
473 my $time = EV::time; 511 my $time = AE::time;
474 512
475 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
477 515
478 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
495 } else { 533 } else {
496 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
497 } 535 }
498 } 536 }
499 537
500 my $time = EV::time - $time; 538 my $time = AE::time - $time;
501 539
502 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
503 541
504 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
505 } else { 543 } else {
549 reset_signals; 587 reset_signals;
550 &$cb 588 &$cb
551 }, @args; 589 }, @args;
552 590
553 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
554} 603}
555 604
556=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
557 606
558=cut 607=cut
724 773
725############################################################################# 774#############################################################################
726 775
727=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
728 777
729Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
732 781
733In the following description, CLASS can be any of C<global>, C<object> 782In 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 783C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
785 834
786Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
788 837
789Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
791 840
792These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
793 842
794=over 4 843=over 4
1085 1134
1086sub reattach { 1135sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1137 my ($obj) = @_;
1089 1138
1139 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1141
1092 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1093 1143
1094 @$registry = (); 1144 @$registry = ();
1095 1145
1143 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1144 1194
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1149 aio_close $fh; 1202 aio_close $fh;
1150 1203
1151 if (@$objs) { 1204 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1157 aio_close $fh; 1213 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1215 }
1160 } else { 1216 } else {
1161 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1162 } 1218 }
1163 1219
1164 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1224 } else {
1166 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1167 } 1226 }
1168 } else { 1227 } else {
1169 aio_unlink $filename; 1228 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1171 } 1230 }
1262 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1263 1322
1264 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1265} 1324}
1266 1325
1326use File::Glob ();
1327
1267cf::player->attach ( 1328cf::player->attach (
1268 on_command => sub { 1329 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1270 1331
1271 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1272 or return; 1333 or return;
1273 1334
1303 1364
1304 cf::override; 1365 cf::override;
1305 }, 1366 },
1306); 1367);
1307 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1308sub load_extensions { 1382sub load_extensions {
1309 cf::sync_job { 1383 cf::sync_job {
1310 my %todo; 1384 my %todo;
1311 1385
1312 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1331 1405
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1408
1335 $ext{source} = 1409 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1338 . $source 1412 . $source
1339 . "\n};\n1"; 1413 . "\n};\n1";
1340 1414
1341 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1342 } 1416 }
1343 1417
1418 my $pass = 0;
1344 my %done; 1419 my %done;
1345 while (%todo) { 1420 while (%todo) {
1346 my $progress; 1421 my $progress;
1347 1422
1423 ++$pass;
1424
1425 ext:
1348 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1428 next ext
1351 unless exists $done{$_}; 1429 unless exists $done{$_};
1352 } 1430 }
1353 1431
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1433
1356 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1438
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1440 if exists $v->{meta}{mandatory};
1364 1441 } else {
1365 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1366 } 1448 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1449 }
1372 1450
1373 skip: 1451 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1376 } 1459 }
1377 }; 1460 };
1378} 1461}
1379 1462
1380############################################################################# 1463#############################################################################
1381 1464
1382=back 1465=back
1383 1466
1384=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1385 1468
1386Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1387 1470
1388=cut 1471=cut
1389 1472
1390package cf::player; 1473package cf::player;
1391 1474
1434 1517
1435sub exists($) { 1518sub exists($) {
1436 my ($login) = @_; 1519 my ($login) = @_;
1437 1520
1438 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1440} 1523}
1441 1524
1442sub find($) { 1525sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1527 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1465 } 1548 }
1466 } 1549 }
1467} 1550}
1468 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1469sub save($) { 1565sub save($) {
1470 my ($pl) = @_; 1566 my ($pl) = @_;
1471 1567
1472 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1473 1569
1478 1574
1479 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1481 1577
1482 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1582
1484 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1584 cf::cede_to_tick;
1486} 1585}
1487 1586
1519 my ($pl) = @_; 1618 my ($pl) = @_;
1520 1619
1521 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1522 1621
1523 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1624
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1530 1631
1531 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1613 } 1714 }
1614 1715
1615 \@paths 1716 \@paths
1616} 1717}
1617 1718
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1720
1620Expand crossfire pod fragments into protocol xml. 1721Expand 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 1722
1711=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1712 1724
1713Sends an ext reply to the player. 1725Sends an ext reply to the player.
1714 1726
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1800
1789 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1802 $self->_create_random_map (
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1927 1939
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1930} 1942}
1931 1943
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 { 1944sub decay_objects {
1942 my ($self) = @_; 1945 my ($self) = @_;
1943 1946
1944 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1945 1948
2027sub find { 2030sub find {
2028 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
2029 2032
2030 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
2031 2034
2032 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2037
2035 $cf::MAP{$path} || do { 2038 $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 2039 my $map = new_from_path cf::map $path
2040 or return; 2040 or return;
2041 2041
2042 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2043 2043
2055 2055
2056 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2057 } 2057 }
2058} 2058}
2059 2059
2060sub pre_load { } 2060sub pre_load { }
2061sub post_load { } 2061#sub post_load { } # XS
2062 2062
2063sub load { 2063sub load {
2064 my ($self) = @_; 2064 my ($self) = @_;
2065 2065
2066 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2084 $f->skip_block;
2085 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2086 or return; 2086 or return;
2087 2087
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2089 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2090 2090
2091 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2092 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2112 $self->decay_objects;
2113 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2114 $self->update_buttons; 2114 $self->update_buttons;
2115 cf::cede_to_tick; 2115 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2116 $self->activate;
2119 } 2117 }
2120 2118
2121 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2125 } 2123 }
2126 2124
2127 $self->post_load; 2125 $self->post_load;
2128} 2126}
2129 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2130sub customise_for { 2131sub customise_for {
2131 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2132 2133
2133 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2135 if $self->per_player;
2211 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2212 2213
2213 () 2214 ()
2214} 2215}
2215 2216
2217# common code, used by both ->save and ->swapout
2216sub save { 2218sub _save {
2217 my ($self) = @_; 2219 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2220
2221 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2222 2222
2223 return unless $self->dirty; 2223 return unless $self->dirty;
2224 2224
2244 } else { 2244 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2246 }
2247} 2247}
2248 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2249sub swap_out { 2257sub swap_out {
2250 my ($self) = @_; 2258 my ($self) = @_;
2251 2259
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2261
2257 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2259 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2260 2265
2261 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2262
2263 $self->deactivate; 2267 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2265 $self->clear; 2275 $self->clear;
2266} 2276}
2267 2277
2268sub reset_at { 2278sub reset_at {
2269 my ($self) = @_; 2279 my ($self) = @_;
2288 2298
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2300
2291 return if $self->players; 2301 return if $self->players;
2292 2302
2293 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2294 2304
2295 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2296 2306
2297 # need to save uniques path 2307 # need to save uniques path
2298 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2389 : normalise $_ 2399 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2401 ]
2392} 2402}
2393 2403
2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2435
2394=back 2436=back
2395 2437
2396=head3 cf::object 2438=head3 cf::object
2397 2439
2398=cut 2440=cut
2463 2505
2464our $SAY_CHANNEL = { 2506our $SAY_CHANNEL = {
2465 id => "say", 2507 id => "say",
2466 title => "Map", 2508 title => "Map",
2467 reply => "say ", 2509 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2511};
2470 2512
2471our $CHAT_CHANNEL = { 2513our $CHAT_CHANNEL = {
2472 id => "chat", 2514 id => "chat",
2473 title => "Chat", 2515 title => "Chat",
2528 2570
2529=item $player_object->enter_link 2571=item $player_object->enter_link
2530 2572
2531Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2532 2574
2533The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2535 2579
2536Will never block. 2580Will never block.
2537 2581
2538=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2539 2583
2564 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2565 2609
2566 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2567 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2568 2612
2569 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2570} 2614}
2571 2615
2572sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2573 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2574 2618
2591 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2593 2637
2594 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2597 2641
2598 $map->load; 2642 $map->load;
2599 $map->load_neighbours; 2643 $map->load_neighbours;
2600 2644
2601 return unless $self->contr->active; 2645 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2646
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2606} 2652}
2607 2653
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2609 2655
2610Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2658that 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 2659the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2660be called at the end of this process.
2661
2662Note that $check will be called with a potentially non-loaded map, so if
2663it needs a loaded map it has to call C<< ->load >>.
2615 2664
2616=cut 2665=cut
2617 2666
2618our $GOTOGEN; 2667our $GOTOGEN;
2619 2668
2766 $self->contr->savebed ($map, $x, $y) 2815 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2816 if $exit->flag (cf::FLAG_DAMNED);
2768 2817
2769 1 2818 1
2770 }) { 2819 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2824
2776 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2793sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2794 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2795 2844
2796 utf8::encode $text; 2845 utf8::encode $text;
2797 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2798} 2872}
2799 2873
2800=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2801 2875
2802Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2806 2880
2807=cut 2881=cut
2808 2882
2809# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2810our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2811 "c/identify" => { 2891 "c/identify" => {
2812 id => "infobox", 2892 id => "infobox",
2813 title => "Identify", 2893 title => "Identify",
2814 reply => undef, 2894 reply => undef,
2815 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2817 "c/examine" => { 2897 "c/examine" => {
2818 id => "infobox", 2898 id => "infobox",
2819 title => "Examine", 2899 title => "Examine",
2820 reply => undef, 2900 reply => undef,
2821 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2822 }, 2908 },
2823 "c/book" => { 2909 "c/book" => {
2824 id => "infobox", 2910 id => "infobox",
2825 title => "Book", 2911 title => "Book",
2826 reply => undef, 2912 reply => undef,
2842 id => "infobox", 2928 id => "infobox",
2843 title => "Body Parts", 2929 title => "Body Parts",
2844 reply => undef, 2930 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2846 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2847 "c/uptime" => { 2969 "c/uptime" => {
2848 id => "infobox", 2970 id => "infobox",
2849 title => "Uptime", 2971 title => "Uptime",
2850 reply => undef, 2972 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2860 id => "party", 2982 id => "party",
2861 title => "Party", 2983 title => "Party",
2862 reply => "gsay ", 2984 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 2985 tooltip => "Messages and chat related to your party",
2864 }, 2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2865); 2995);
2866 2996
2867sub cf::client::send_msg { 2997sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2999
2870 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2871 3002
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 3004
2874 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2877 3008
2878 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2882 3011
2883 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 3017 }
2890 3018
2891 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2892 } 3020 }
2893 3021
2894 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2895 3023
2896 if ($self->can_msg) {
2897 # default colour, mask it out 3024 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2900 3027
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 3031 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 3032
2915 $color &= cf::NDI_COLOR_MASK; 3033 $self->send_big_packet ($pkt);
2916
2917 utf8::encode $msg;
2918
2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 }
2928} 3034}
2929 3035
2930=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2931 3037
2932Sends an ext event to the client. 3038Sends an ext event to the client.
2935 3041
2936sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2937 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2938 3044
2939 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2942 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2944 } 3050 }
2945} 3051}
2946 3052
2947=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2948 3054
2952 3058
2953sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2954 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2955 3061
2956 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2957 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2958 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2959 #TODO: version 1, remove 3065 #TODO: version 1, remove
2960 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2961 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2962 } 3068 }
2963} 3069}
2964 3070
2965=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2966 3072
3067 3173
3068 $coro 3174 $coro
3069} 3175}
3070 3176
3071cf::client->attach ( 3177cf::client->attach (
3072 on_destroy => sub { 3178 on_client_destroy => sub {
3073 my ($ns) = @_; 3179 my ($ns) = @_;
3074 3180
3075 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3076 }, 3182 },
3077); 3183);
3093our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3094 3200
3095$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3096 3202
3097$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3098 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3099 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3100 sort time 3206 sort time
3101)); 3207));
3102 3208
3103# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3107The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3108 3214
3109 cf::object 3215 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split 3217 insert remove name archname title slaying race decrease split
3218 value
3112 3219
3113 cf::object::player 3220 cf::object::player
3114 player 3221 player
3115 3222
3116 cf::player 3223 cf::player
3121 3228
3122=cut 3229=cut
3123 3230
3124for ( 3231for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3128 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3130 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3131) { 3238) {
3132 no strict 'refs'; 3239 no strict 'refs';
3133 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3134 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3152 3259
3153 my $qcode = $code; 3260 my $qcode = $code;
3154 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3155 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3156 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3157 local $_; 3267 local $_;
3158 local @safe::cf::_safe_eval_args = values %vars;
3159 3268
3160 my $eval = 3269 my $eval =
3161 "do {\n" 3270 "do {\n"
3162 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3163 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3164 . $code 3273 . $code
3165 . "\n}" 3274 . "\n}"
3166 ; 3275 ;
3167 3276
3277 if ($CFG{safe_eval}) {
3168 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3169 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3170 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3171 3286
3172 if ($@) { 3287 if ($@) {
3173 warn "$@"; 3288 warn "$@";
3174 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3175 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3194=cut 3309=cut
3195 3310
3196sub register_script_function { 3311sub register_script_function {
3197 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3198 3313
3199 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3200 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3201} 3316}
3202 3317
3203=back 3318=back
3204 3319
3205=cut 3320=cut
3226 3341
3227 $facedata->{version} == 2 3342 $facedata->{version} == 2
3228 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3229 3344
3230 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3231 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3232 type => FT_RSRC, 3348 type => FT_RSRC,
3233 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3234 }; 3351 };
3235 cf::cede_to_tick; 3352 cf::cede_to_tick;
3236 3353
3237 { 3354 {
3238 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3240 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3241 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242 3359
3243 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3244 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3247 3364
3248 cf::cede_to_tick; 3365 cf::cede_to_tick;
3249 } 3366 }
3250 3367
3251 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3275 3392
3276 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3277 } 3394 }
3278 3395
3279 { 3396 {
3280 # TODO: for gcfclient pleasure, we should give resources
3281 # that gcfclient doesn't grok a >10000 face index.
3282 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3283 3398
3284 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3286 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3287 my $data;
3288 3402
3289 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3290 # prepend meta info
3291
3292 my $meta = $enc->encode ({
3293 name => $name,
3294 %{ $info->{meta} || {} },
3295 });
3296
3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3304 } else { 3405 } else {
3305 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3306 } 3407 }
3307 3408
3390 reload_treasures; 3491 reload_treasures;
3391 3492
3392 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3393} 3494}
3394 3495
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399}
3400
3401sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3500 or return;
3404 3501
3405 local $/; 3502 local $/;
3406 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3407 3504
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3409 3506
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3416 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3417 }; 3514 };
3418 warn $@ if $@; 3515 warn $@ if $@;
3419 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3420} 3547}
3421 3548
3422sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3423 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3562 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3430 }; 3566 };
3431 3567
3432 { 3568 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3434 reload_config; 3580 reload_config;
3435 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3436 load_extensions; 3591 load_extensions;
3437 3592
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3593 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3594
3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3600 };
3441 3601
3442 EV::loop; 3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3443} 3606}
3444 3607
3445############################################################################# 3608#############################################################################
3446# initialisation and cleanup 3609# initialisation and cleanup
3447 3610
3448# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3449BEGIN { 3612BEGIN {
3450 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3451 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3452 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3453 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3454 }; 3617 };
3455 } 3618 }
3456} 3619}
3457 3620
3458sub write_runtime_sync { 3621sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3460 3623
3461 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3463 3626
3464 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3628
3466 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3467 3630
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3469 or return; 3632 or return;
3470 3633
3471 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3483 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3484 3647
3485 close $fh 3648 close $fh
3486 or return; 3649 or return;
3487 3650
3488 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3652 and return;
3490 3653
3491 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3492 3655
3493 1 3656 1
3494} 3657}
3495 3658
3496our $uuid_lock; 3659our $uuid_lock;
3505 my $uuid = "$LOCALDIR/uuid"; 3668 my $uuid = "$LOCALDIR/uuid";
3506 3669
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3671 or return;
3509 3672
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3681 $uuid_skip = 0;
3512 3682
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3684 and return;
3515 3685
3537} 3707}
3538 3708
3539sub emergency_save() { 3709sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3541 3711
3542 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3543 3713
3544 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3545 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3726 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3728 $pl->save;
3554 } 3729 }
3555 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3556 3731
3557 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3735 $map->valid or next;
3561 $map->save; 3736 $map->save;
3562 } 3737 }
3563 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3564 3739
3565 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3568 3743
3569 warn "begin write uuid\n"; 3744 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3745 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3746 warn "emergency_perl_save: end write uuid\n";
3572 }; 3747 };
3573 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3574 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3575} 3755}
3576 3756
3577sub post_cleanup { 3757sub post_cleanup {
3578 my ($make_core) = @_; 3758 my ($make_core) = @_;
3579 3759
3580 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3582} 3790}
3583 3791
3584sub do_reload_perl() { 3792sub do_reload_perl() {
3585 # can/must only be called in main 3793 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3794 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3795 warn "can only reload from main coroutine";
3588 return; 3796 return;
3589 } 3797 }
3590 3798
3799 return if $RELOAD++;
3800
3801 my $t1 = AE::time;
3802
3803 while ($RELOAD) {
3591 warn "reloading..."; 3804 warn "reloading...";
3592 3805
3593 warn "entering sync_job"; 3806 warn "entering sync_job";
3594 3807
3595 cf::sync_job { 3808 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3809 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3810 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3811 cf::write_runtime_sync; # external watchdog should not bark
3599 3812
3600 warn "syncing database to disk"; 3813 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3814 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3815
3603 # if anything goes wrong in here, we should simply crash as we already saved 3816 # if anything goes wrong in here, we should simply crash as we already saved
3604 3817
3605 warn "flushing outstanding aio requests"; 3818 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3819 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3820 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3821 }
3637 3822
3638 warn "... nuking $pkg"; 3823 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3824 $_->cancel for values %EXT_CORO;
3640 } 3825 %EXT_CORO = ();
3641 3826
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3827 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3828 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3829
3830 warn "removing ext/exti commands";
3831 %EXTCMD = ();
3832 %EXTICMD = ();
3833
3834 warn "unloading/nuking all extensions";
3835 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3836 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3837
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3838 if (my $cb = $pkg->can ("unload")) {
3839 eval {
3653 $cb->(); 3840 $cb->($pkg);
3841 1
3842 } or warn "$pkg unloaded, but with errors: $@";
3843 }
3844
3845 warn "... clearing $pkg";
3846 clear_package $pkg;
3654 } 3847 }
3655 3848
3656 Symbol::delete_package $k; 3849 warn "unloading all perl modules loaded from $LIBDIR";
3850 while (my ($k, $v) = each %INC) {
3851 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3852
3853 warn "... unloading $k";
3854 delete $INC{$k};
3855
3856 $k =~ s/\.pm$//;
3857 $k =~ s/\//::/g;
3858
3859 if (my $cb = $k->can ("unload_module")) {
3860 $cb->();
3861 }
3862
3863 clear_package $k;
3657 } 3864 }
3658 3865
3659 warn "getting rid of safe::, as good as possible"; 3866 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3867 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3868 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3869
3663 warn "unloading cf.pm \"a bit\""; 3870 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3871 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3872 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3666 3873
3667 # don't, removes xs symbols, too, 3874 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3875 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3876 #clear_package __PACKAGE__;
3670 3877
3671 warn "unload completed, starting to reload now"; 3878 warn "unload completed, starting to reload now";
3672 3879
3673 warn "reloading cf.pm"; 3880 warn "reloading cf.pm";
3674 require cf; 3881 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3882 cf::_connect_to_perl_1;
3676 3883
3677 warn "loading config and database again"; 3884 warn "loading config and database again";
3678 cf::reload_config; 3885 cf::reload_config;
3679 3886
3680 warn "loading extensions"; 3887 warn "loading extensions";
3681 cf::load_extensions; 3888 cf::load_extensions;
3682 3889
3890 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3891 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3892 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3893 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3894 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3895 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3896 reattach $_ for values %PLAYER;
3897 }
3689 3898
3899 warn "running post_init jobs";
3900 (pop @POST_INIT)->(1) while @POST_INIT;
3901
3690 warn "leaving sync_job"; 3902 warn "leaving sync_job";
3691 3903
3692 1 3904 1
3693 } or do { 3905 } or do {
3694 warn $@; 3906 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3907 cf::cleanup "error while reloading, exiting.";
3696 }; 3908 };
3697 3909
3698 warn "reloaded"; 3910 warn "reloaded";
3911 --$RELOAD;
3912 }
3913
3914 $t1 = AE::time - $t1;
3915 warn "reload completed in ${t1}s\n";
3699}; 3916};
3700 3917
3701our $RELOAD_WATCHER; # used only during reload 3918our $RELOAD_WATCHER; # used only during reload
3702 3919
3703sub reload_perl() { 3920sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3921 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3922 # coro crashes during coro_state_free->destroy here.
3706 3923
3924 $RELOAD_WATCHER ||= cf::async {
3925 Coro::AIO::aio_wait cache_extensions;
3926
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3927 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3928 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3929 undef $RELOAD_WATCHER;
3930 };
3710 }; 3931 };
3711} 3932}
3712 3933
3713register_command "reload" => sub { 3934register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3935 my ($who, $arg) = @_;
3728 3949
3729our @WAIT_FOR_TICK; 3950our @WAIT_FOR_TICK;
3730our @WAIT_FOR_TICK_BEGIN; 3951our @WAIT_FOR_TICK_BEGIN;
3731 3952
3732sub wait_for_tick { 3953sub wait_for_tick {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 3955
3735 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK, $signal; 3957 push @WAIT_FOR_TICK, $signal;
3737 $signal->wait; 3958 $signal->wait;
3738} 3959}
3739 3960
3740sub wait_for_tick_begin { 3961sub wait_for_tick_begin {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 3962 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 3963
3743 my $signal = new Coro::Signal; 3964 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK_BEGIN, $signal; 3965 push @WAIT_FOR_TICK_BEGIN, $signal;
3745 $signal->wait; 3966 $signal->wait;
3746} 3967}
3751 unless ++$bug_warning > 10; 3972 unless ++$bug_warning > 10;
3752 return; 3973 return;
3753 } 3974 }
3754 3975
3755 cf::server_tick; # one server iteration 3976 cf::server_tick; # one server iteration
3977
3978 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3756 3979
3757 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3980 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3981 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3759 Coro::async_pool { 3982 Coro::async_pool {
3760 $Coro::current->{desc} = "runtime saver"; 3983 $Coro::current->{desc} = "runtime saver";
3783} 4006}
3784 4007
3785{ 4008{
3786 # configure BDB 4009 # configure BDB
3787 4010
3788 BDB::min_parallel 8; 4011 BDB::min_parallel 16;
3789 BDB::max_poll_reqs $TICK * 0.1; 4012 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 4013 $AnyEvent::BDB::WATCHER->priority (1);
3791 4014
3792 unless ($DB_ENV) { 4015 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 4016 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4017 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 4018 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4019 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4020 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4021 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 4022
3799 cf::sync_job { 4023 cf::sync_job {
3800 eval { 4024 eval {
3826{ 4050{
3827 # configure IO::AIO 4051 # configure IO::AIO
3828 4052
3829 IO::AIO::min_parallel 8; 4053 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4054 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 4055 undef $AnyEvent::AIO::WATCHER;
3832} 4056}
3833 4057
3834my $_log_backtrace; 4058my $_log_backtrace;
3835 4059
3836sub _log_backtrace { 4060sub _log_backtrace {
3839 $msg =~ s/\n//; 4063 $msg =~ s/\n//;
3840 4064
3841 # limit the # of concurrent backtraces 4065 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4066 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 4067 ++$_log_backtrace;
4068 my $perl_bt = Carp::longmess $msg;
3844 async { 4069 async {
3845 $Coro::current->{desc} = "abt $msg"; 4070 $Coro::current->{desc} = "abt $msg";
3846 4071
3847 my @bt = fork_call { 4072 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 4073 @addr = map { sprintf "%x", $_ } @addr;
3859 } 4084 }
3860 4085
3861 @funcs 4086 @funcs
3862 }; 4087 };
3863 4088
3864 LOG llevInfo, "[ABT] $msg\n"; 4089 LOG llevInfo, "[ABT] $perl_bt\n";
4090 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 4091 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 4092 --$_log_backtrace;
3867 }; 4093 };
3868 } else { 4094 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 4095 LOG llevInfo, "[ABT] $msg\n";
3870 LOG llevInfo, "[ABT] [suppressed]\n"; 4096 LOG llevInfo, "[ABT] [suppressed]\n";
3871 } 4097 }
3872} 4098}
3873 4099
3874# load additional modules 4100# load additional modules
3875use cf::pod; 4101require "cf/$_.pm" for @EXTRA_MODULES;
4102cf::_connect_to_perl_2;
3876 4103
3877END { cf::emergency_save } 4104END { cf::emergency_save }
3878 4105
38791 41061
3880 4107

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines