ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.429 by root, Sat May 3 15:17:13 2008 UTC vs.
Revision 1.514 by root, Mon Apr 12 17:13:36 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;
2288 2289
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2291
2291 return if $self->players; 2292 return if $self->players;
2292 2293
2293 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2294 2295
2295 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2296 2297
2297 # need to save uniques path 2298 # need to save uniques path
2298 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2389 : normalise $_ 2390 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2392 ]
2392} 2393}
2393 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2394=back 2427=back
2395 2428
2396=head3 cf::object 2429=head3 cf::object
2397 2430
2398=cut 2431=cut
2463 2496
2464our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2465 id => "say", 2498 id => "say",
2466 title => "Map", 2499 title => "Map",
2467 reply => "say ", 2500 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2502};
2470 2503
2471our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2472 id => "chat", 2505 id => "chat",
2473 title => "Chat", 2506 title => "Chat",
2528 2561
2529=item $player_object->enter_link 2562=item $player_object->enter_link
2530 2563
2531Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2532 2565
2533The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2535 2570
2536Will never block. 2571Will never block.
2537 2572
2538=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2539 2574
2591 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2593 2628
2594 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2597 2632
2598 $map->load; 2633 $map->load;
2599 $map->load_neighbours; 2634 $map->load_neighbours;
2600 2635
2601 return unless $self->contr->active; 2636 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2637
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2606} 2643}
2607 2644
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2609 2646
2610Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2649that 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 2650the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2651be called at the end of this process.
2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2615 2655
2616=cut 2656=cut
2617 2657
2618our $GOTOGEN; 2658our $GOTOGEN;
2619 2659
2698} 2738}
2699 2739
2700sub prepare_random_map { 2740sub prepare_random_map {
2701 my ($exit) = @_; 2741 my ($exit) = @_;
2702 2742
2703 my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2706 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2707 # that depends on the exit object 2745 # that depends on the exit object
2708 2746
2709 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2711 if ($exit->map) { 2749 if ($exit->map) {
2712 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2713 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2714 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2715 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2716 } 2756 }
2717 2757
2718 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2719 2759
2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2725 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2726 undef $fh; 2766 undef $fh;
2727 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2728 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2729 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2730 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2731 } 2775 }
2732} 2776}
2733 2777
2734sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2735 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2736 2780
2737 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2738 2782
2739 if ($exit->slaying eq "/!") {
2740 #TODO: this should de-fi-ni-te-ly not be a sync-job
2741 # the problem is that $exit might not survive long enough
2742 # so it needs to be done right now, right here
2743 cf::sync_job { prepare_random_map $exit };
2744 }
2745
2746 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747 my $hp = $exit->stats->hp;
2748 my $sp = $exit->stats->sp;
2749
2750 $self->enter_link; 2783 $self->enter_link;
2751 2784
2752 # if exit is damned, update players death & WoR home-position
2753 $self->contr->savebed ($slaying, $hp, $sp)
2754 if $exit->flag (FLAG_DAMNED);
2755
2756 (async { 2785 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2786 $Coro::current->{desc} = "enter_exit";
2758 2787
2759 $self->deactivate_recursive; # just to be sure
2760 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2761 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2762 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2763 1; 2809 1
2764 }) { 2810 }) {
2765 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2766 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2767 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2768 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2769 2815
2770 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2787sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2788 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2789 2835
2790 utf8::encode $text; 2836 utf8::encode $text;
2791 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2792} 2863}
2793 2864
2794=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2795 2866
2796Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2800 2871
2801=cut 2872=cut
2802 2873
2803# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2804our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2805 "c/identify" => { 2882 "c/identify" => {
2806 id => "infobox", 2883 id => "infobox",
2807 title => "Identify", 2884 title => "Identify",
2808 reply => undef, 2885 reply => undef,
2809 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2811 "c/examine" => { 2888 "c/examine" => {
2812 id => "infobox", 2889 id => "infobox",
2813 title => "Examine", 2890 title => "Examine",
2814 reply => undef, 2891 reply => undef,
2815 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2816 }, 2899 },
2817 "c/book" => { 2900 "c/book" => {
2818 id => "infobox", 2901 id => "infobox",
2819 title => "Book", 2902 title => "Book",
2820 reply => undef, 2903 reply => undef,
2836 id => "infobox", 2919 id => "infobox",
2837 title => "Body Parts", 2920 title => "Body Parts",
2838 reply => undef, 2921 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2840 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2841 "c/uptime" => { 2960 "c/uptime" => {
2842 id => "infobox", 2961 id => "infobox",
2843 title => "Uptime", 2962 title => "Uptime",
2844 reply => undef, 2963 reply => undef,
2845 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2854 id => "party", 2973 id => "party",
2855 title => "Party", 2974 title => "Party",
2856 reply => "gsay ", 2975 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2858 }, 2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2859); 2986);
2860 2987
2861sub cf::client::send_msg { 2988sub cf::client::send_msg {
2862 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2863 2990
2864 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2865 2993
2866 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2867 2995
2868 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2869 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2871 2999
2872 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2876 3002
2877 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2878 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2879 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2880 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2881 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883 } 3008 }
2884 3009
2885 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2886 } 3011 }
2887 3012
2888 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2889 3014
2890 if ($self->can_msg) {
2891 # default colour, mask it out 3015 # default colour, mask it out
2892 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2893 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2894 3018
2895 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2896 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2897 } else { 3022 );
2898 if ($color >= 0) {
2899 # replace some tags by gcfclient-compatible ones
2900 for ($msg) {
2901 1 while
2902 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2903 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2904 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2905 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2906 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2907 }
2908 3023
2909 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2910
2911 utf8::encode $msg;
2912
2913 if (0 && $msg =~ /\[/) {
2914 # COMMAND/INFO
2915 $self->send_packet ("drawextinfo $color 10 8 $msg")
2916 } else {
2917 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2918 $self->send_packet ("drawinfo $color $msg")
2919 }
2920 }
2921 }
2922} 3025}
2923 3026
2924=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2925 3028
2926Sends an ext event to the client. 3029Sends an ext event to the client.
2929 3032
2930sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2931 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2932 3035
2933 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2934 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2935 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2936 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2937 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2938 } 3041 }
2939} 3042}
2940 3043
2941=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2942 3045
2946 3049
2947sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2948 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2949 3052
2950 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2952 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2953 #TODO: version 1, remove 3056 #TODO: version 1, remove
2954 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2955 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2956 } 3059 }
2957} 3060}
2958 3061
2959=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2960 3063
3061 3164
3062 $coro 3165 $coro
3063} 3166}
3064 3167
3065cf::client->attach ( 3168cf::client->attach (
3066 on_destroy => sub { 3169 on_client_destroy => sub {
3067 my ($ns) = @_; 3170 my ($ns) = @_;
3068 3171
3069 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3070 }, 3173 },
3071); 3174);
3087our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3088 3191
3089$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3090 3193
3091$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3092 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3093 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3094 sort time 3197 sort time
3095)); 3198));
3096 3199
3097# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3101The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3102 3205
3103 cf::object 3206 cf::object
3104 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
3105 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3106 3210
3107 cf::object::player 3211 cf::object::player
3108 player 3212 player
3109 3213
3110 cf::player 3214 cf::player
3115 3219
3116=cut 3220=cut
3117 3221
3118for ( 3222for (
3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3121 decrease split destroy)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3122 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3123 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3124 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3125) { 3229) {
3126 no strict 'refs'; 3230 no strict 'refs';
3127 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3128 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3146 3250
3147 my $qcode = $code; 3251 my $qcode = $code;
3148 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3149 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3150 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3151 local $_; 3258 local $_;
3152 local @safe::cf::_safe_eval_args = values %vars;
3153 3259
3154 my $eval = 3260 my $eval =
3155 "do {\n" 3261 "do {\n"
3156 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3157 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3158 . $code 3264 . $code
3159 . "\n}" 3265 . "\n}"
3160 ; 3266 ;
3161 3267
3268 if ($CFG{safe_eval}) {
3162 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3163 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3164 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3165 3277
3166 if ($@) { 3278 if ($@) {
3167 warn "$@"; 3279 warn "$@";
3168 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3169 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3188=cut 3300=cut
3189 3301
3190sub register_script_function { 3302sub register_script_function {
3191 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3192 3304
3193 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3194 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3195} 3307}
3196 3308
3197=back 3309=back
3198 3310
3199=cut 3311=cut
3220 3332
3221 $facedata->{version} == 2 3333 $facedata->{version} == 2
3222 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3223 3335
3224 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3225 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3226 type => FT_RSRC, 3339 type => FT_RSRC,
3227 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3228 }; 3342 };
3229 cf::cede_to_tick; 3343 cf::cede_to_tick;
3230 3344
3231 { 3345 {
3232 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3234 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3235 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236 3350
3237 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3238 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3241 3355
3242 cf::cede_to_tick; 3356 cf::cede_to_tick;
3243 } 3357 }
3244 3358
3245 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3269 3383
3270 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3271 } 3385 }
3272 3386
3273 { 3387 {
3274 # TODO: for gcfclient pleasure, we should give resources
3275 # that gcfclient doesn't grok a >10000 face index.
3276 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3277 3389
3278 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3280 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3281 my $data;
3282 3393
3283 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3284 # prepend meta info
3285
3286 my $meta = $enc->encode ({
3287 name => $name,
3288 %{ $info->{meta} || {} },
3289 });
3290
3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3298 } else { 3396 } else {
3299 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3300 } 3398 }
3301 3399
3384 reload_treasures; 3482 reload_treasures;
3385 3483
3386 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3387} 3485}
3388 3486
3389sub init {
3390 my $guard = freeze_mainloop;
3391
3392 reload_resources;
3393}
3394
3395sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3397 or return; 3491 or return;
3398 3492
3399 local $/; 3493 local $/;
3400 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3401 3495
3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3403 3497
3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3409 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3410 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3411 }; 3505 };
3412 warn $@ if $@; 3506 warn $@ if $@;
3413 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3414} 3538}
3415 3539
3416sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3554
3417 # we must not ever block the main coroutine 3555 # we must not ever block the main coroutine
3418 local $Coro::idle = sub { 3556 local $Coro::idle = sub {
3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3557 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3420 (async { 3558 (async {
3421 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3559 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT; 3560 EV::loop EV::LOOP_ONESHOT;
3423 })->prio (Coro::PRIO_MAX); 3561 })->prio (Coro::PRIO_MAX);
3424 }; 3562 };
3425 3563
3426 { 3564 evthread_start IO::AIO::poll_fileno;
3427 my $guard = freeze_mainloop; 3565
3566 cf::sync_job {
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3428 reload_config; 3571 reload_config;
3429 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3430 load_extensions; 3582 load_extensions;
3431 3583
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3584 utime time, time, $RUNTIMEFILE;
3433 evthread_start IO::AIO::poll_fileno; 3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3434 } 3591 };
3435 3592
3436 EV::loop; 3593 main_loop;
3437} 3594}
3438 3595
3439############################################################################# 3596#############################################################################
3440# initialisation and cleanup 3597# initialisation and cleanup
3441 3598
3442# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3443BEGIN { 3600BEGIN {
3444 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3445 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3446 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3447 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3448 }; 3605 };
3449 } 3606 }
3450} 3607}
3451 3608
3452sub write_runtime_sync { 3609sub write_runtime_sync {
3453 my $runtime = "$LOCALDIR/runtime"; 3610 my $t0 = AE::time;
3454 3611
3455 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3456 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3457 3614
3458 IO::AIO::aio_utime $runtime, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3459 3616
3460 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3461 3618
3462 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3463 or return; 3620 or return;
3464 3621
3465 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3466 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3467 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3477 aio_utime $fh, undef, undef; 3634 aio_utime $fh, undef, undef;
3478 3635
3479 close $fh 3636 close $fh
3480 or return; 3637 or return;
3481 3638
3482 aio_rename "$runtime~", $runtime 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3483 and return; 3640 and return;
3484 3641
3485 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3486 3643
3487 1 3644 1
3488} 3645}
3489 3646
3490our $uuid_lock; 3647our $uuid_lock;
3499 my $uuid = "$LOCALDIR/uuid"; 3656 my $uuid = "$LOCALDIR/uuid";
3500 3657
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return; 3659 or return;
3503 3660
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3505 $uuid_skip = 0; 3669 $uuid_skip = 0;
3506 3670
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return; 3672 and return;
3509 3673
3531} 3695}
3532 3696
3533sub emergency_save() { 3697sub emergency_save() {
3534 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3535 3699
3536 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3537 3701
3538 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3539 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3540 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3541 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3542 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3543 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3544 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3545 $pl->valid or next; 3714 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3547 $pl->save; 3716 $pl->save;
3548 } 3717 }
3549 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3550 3719
3551 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3552 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3553 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3554 $map->valid or next; 3723 $map->valid or next;
3555 $map->save; 3724 $map->save;
3556 } 3725 }
3557 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3558 3727
3559 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3560 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3561 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3562 3731
3563 warn "begin write uuid\n"; 3732 warn "emergency_perl_save: begin write uuid\n";
3564 write_uuid_sync 1; 3733 write_uuid_sync 1;
3565 warn "end write uuid\n"; 3734 warn "emergency_perl_save: end write uuid\n";
3566 }; 3735 };
3567 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3568 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3569} 3743}
3570 3744
3571sub post_cleanup { 3745sub post_cleanup {
3572 my ($make_core) = @_; 3746 my ($make_core) = @_;
3573 3747
3574 warn Carp::longmess "post_cleanup backtrace" 3748 warn Carp::longmess "post_cleanup backtrace"
3575 if $make_core; 3749 if $make_core;
3750
3751 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$;
3753}
3754
3755# a safer delete_package, copied from Symbol
3756sub clear_package($) {
3757 my $pkg = shift;
3758
3759 # expand to full symbol table name if needed
3760 unless ($pkg =~ /^main::.*::$/) {
3761 $pkg = "main$pkg" if $pkg =~ /^::/;
3762 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3763 $pkg .= '::' unless $pkg =~ /::$/;
3764 }
3765
3766 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3767 my $stem_symtab = *{$stem}{HASH};
3768
3769 defined $stem_symtab and exists $stem_symtab->{$leaf}
3770 or return;
3771
3772 # clear all symbols
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 }
3778 warn "cleared package $pkg\n";#d#
3576} 3779}
3577 3780
3578sub do_reload_perl() { 3781sub do_reload_perl() {
3579 # can/must only be called in main 3782 # can/must only be called in main
3580 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3581 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3582 return; 3785 return;
3583 } 3786 }
3584 3787
3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3791
3792 while ($RELOAD) {
3585 warn "reloading..."; 3793 warn "reloading...";
3586 3794
3587 warn "entering sync_job"; 3795 warn "entering sync_job";
3588 3796
3589 cf::sync_job { 3797 cf::sync_job {
3590 cf::write_runtime_sync; # external watchdog should not bark 3798 cf::write_runtime_sync; # external watchdog should not bark
3591 cf::emergency_save; 3799 cf::emergency_save;
3592 cf::write_runtime_sync; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3593 3801
3594 warn "syncing database to disk"; 3802 warn "syncing database to disk";
3595 BDB::db_env_txn_checkpoint $DB_ENV; 3803 BDB::db_env_txn_checkpoint $DB_ENV;
3596 3804
3597 # if anything goes wrong in here, we should simply crash as we already saved 3805 # if anything goes wrong in here, we should simply crash as we already saved
3598 3806
3599 warn "flushing outstanding aio requests"; 3807 warn "flushing outstanding aio requests";
3600 for (;;) {
3601 BDB::flush;
3602 IO::AIO::flush;
3603 Coro::cede_notself;
3604 last unless IO::AIO::nreqs || BDB::nreqs; 3808 while (IO::AIO::nreqs || BDB::nreqs) {
3605 warn "iterate..."; 3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3606 }
3607
3608 ++$RELOAD;
3609
3610 warn "cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = ();
3613
3614 warn "removing commands";
3615 %COMMAND = ();
3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg";
3624
3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 } 3810 }
3631 3811
3632 warn "... nuking $pkg"; 3812 warn "cancelling all extension coros";
3633 Symbol::delete_package $pkg; 3813 $_->cancel for values %EXT_CORO;
3634 } 3814 %EXT_CORO = ();
3635 3815
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3816 warn "removing commands";
3637 while (my ($k, $v) = each %INC) { 3817 %COMMAND = ();
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3818
3819 warn "removing ext/exti commands";
3820 %EXTCMD = ();
3821 %EXTICMD = ();
3822
3823 warn "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) {
3640 warn "... unloading $k"; 3825 warn "... unloading $pkg";
3641 delete $INC{$k};
3642 3826
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) { 3827 if (my $cb = $pkg->can ("unload")) {
3828 eval {
3647 $cb->(); 3829 $cb->($pkg);
3830 1
3831 } or warn "$pkg unloaded, but with errors: $@";
3832 }
3833
3834 warn "... clearing $pkg";
3835 clear_package $pkg;
3648 } 3836 }
3649 3837
3650 Symbol::delete_package $k; 3838 warn "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841
3842 warn "... unloading $k";
3843 delete $INC{$k};
3844
3845 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g;
3847
3848 if (my $cb = $k->can ("unload_module")) {
3849 $cb->();
3850 }
3851
3852 clear_package $k;
3651 } 3853 }
3652 3854
3653 warn "getting rid of safe::, as good as possible"; 3855 warn "getting rid of safe::, as good as possible";
3654 Symbol::delete_package "safe::$_" 3856 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3858
3657 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3862
3661 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3864 # and global variables created in xs
3663 #Symbol::delete_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3664 3866
3665 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3666 3868
3667 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3668 require cf; 3870 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3670 3872
3671 warn "loading config and database again"; 3873 warn "loading config and database again";
3672 cf::reload_config; 3874 cf::reload_config;
3673 3875
3674 warn "loading extensions"; 3876 warn "loading extensions";
3675 cf::load_extensions; 3877 cf::load_extensions;
3676 3878
3879 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3683 3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890
3684 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3685 3892
3686 1 3893 1
3687 } or do { 3894 } or do {
3688 warn $@; 3895 warn $@;
3689 cf::cleanup "error while reloading, exiting."; 3896 cf::cleanup "error while reloading, exiting.";
3690 }; 3897 };
3691 3898
3692 warn "reloaded"; 3899 warn "reloaded";
3900 --$RELOAD;
3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3693}; 3905};
3694 3906
3695our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3696 3908
3697sub reload_perl() { 3909sub reload_perl() {
3698 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3699 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3700 3912
3913 $RELOAD_WATCHER ||= cf::async {
3914 Coro::AIO::aio_wait cache_extensions;
3915
3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3702 do_reload_perl; 3917 do_reload_perl;
3703 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3919 };
3704 }; 3920 };
3705} 3921}
3706 3922
3707register_command "reload" => sub { 3923register_command "reload" => sub {
3708 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3722 3938
3723our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3724our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3725 3941
3726sub wait_for_tick { 3942sub wait_for_tick {
3727 return if tick_inhibit || $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3728 3944
3729 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3730 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3731 $signal->wait; 3947 $signal->wait;
3732} 3948}
3733 3949
3734sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3735 return if tick_inhibit || $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3736 3952
3737 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3738 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3739 $signal->wait; 3955 $signal->wait;
3740} 3956}
3745 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3746 return; 3962 return;
3747 } 3963 }
3748 3964
3749 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3966
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3750 3968
3751 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3753 Coro::async_pool { 3971 Coro::async_pool {
3754 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3777} 3995}
3778 3996
3779{ 3997{
3780 # configure BDB 3998 # configure BDB
3781 3999
3782 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3783 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3784 $Coro::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3785 4003
3786 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3787 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3789 | BDB::LOG_AUTOREMOVE, 1); 4007 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4008 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4009 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4010 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3792 4011
3793 cf::sync_job { 4012 cf::sync_job {
3794 eval { 4013 eval {
3820{ 4039{
3821 # configure IO::AIO 4040 # configure IO::AIO
3822 4041
3823 IO::AIO::min_parallel 8; 4042 IO::AIO::min_parallel 8;
3824 IO::AIO::max_poll_time $TICK * 0.1; 4043 IO::AIO::max_poll_time $TICK * 0.1;
3825 $Coro::AIO::WATCHER->priority (1); 4044 undef $AnyEvent::AIO::WATCHER;
3826} 4045}
3827 4046
3828my $_log_backtrace; 4047my $_log_backtrace;
3829 4048
3830sub _log_backtrace { 4049sub _log_backtrace {
3833 $msg =~ s/\n//; 4052 $msg =~ s/\n//;
3834 4053
3835 # limit the # of concurrent backtraces 4054 # limit the # of concurrent backtraces
3836 if ($_log_backtrace < 2) { 4055 if ($_log_backtrace < 2) {
3837 ++$_log_backtrace; 4056 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg;
3838 async { 4058 async {
3839 $Coro::current->{desc} = "abt $msg"; 4059 $Coro::current->{desc} = "abt $msg";
3840 4060
3841 my @bt = fork_call { 4061 my @bt = fork_call {
3842 @addr = map { sprintf "%x", $_ } @addr; 4062 @addr = map { sprintf "%x", $_ } @addr;
3853 } 4073 }
3854 4074
3855 @funcs 4075 @funcs
3856 }; 4076 };
3857 4077
3858 LOG llevInfo, "[ABT] $msg\n"; 4078 LOG llevInfo, "[ABT] $perl_bt\n";
4079 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3859 LOG llevInfo, "[ABT] $_\n" for @bt; 4080 LOG llevInfo, "[ABT] $_\n" for @bt;
3860 --$_log_backtrace; 4081 --$_log_backtrace;
3861 }; 4082 };
3862 } else { 4083 } else {
3863 LOG llevInfo, "[ABT] $msg\n"; 4084 LOG llevInfo, "[ABT] $msg\n";
3864 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3865 } 4086 }
3866} 4087}
3867 4088
3868# load additional modules 4089# load additional modules
3869use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3870 4092
3871END { cf::emergency_save } 4093END { cf::emergency_save }
3872 4094
38731 40951
3874 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines