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.438 by elmex, Sun Jul 13 20:15:51 2008 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB 1.6; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
96 115
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 118our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
101 120
102our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 124our $DB_ENV;
106 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
107our %CFG; 128our %CFG;
108 129
109our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 131our $RUNTIME;
111our $NOW; 132our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 143our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
124 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
125binmode STDOUT; 151binmode STDOUT;
126binmode STDERR; 152binmode STDERR;
127 153
128# read virtual server time, if available 154# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
133} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
134 162
135mkdir $_ 163mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 165
138our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
139 167
140sub 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::"} };
141 180
142############################################################################# 181#############################################################################
143 182
144=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
145 184
192returns 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
193per 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.
194 233
195=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
196 235
197This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
198C<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
199that call. 238that call.
200 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
201=back 246=back
202 247
203=cut 248=cut
204 249
205BEGIN { 250$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 251 my $msg = join "", @_;
208 252
209 $msg .= "\n" 253 $msg .= "\n"
210 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
211 255
212 $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;
213 257
214 LOG llevError, $msg; 258 LOG llevError, $msg;
215 }; 259};
216}
217 260
218$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
220 265
221 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 268 return;#d#
224 }#d# 269 }#d#
225 270
226 # kill coroutine otherwise 271 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 272 Coro::terminate
229}; 273};
230
231$SIG{__DIE__} = sub { }; #d#?
232 274
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 285for my $pkg (qw(
244 cf::global cf::attachable 286 cf::global cf::attachable
245 cf::object cf::object::player 287 cf::object cf::object::player
246 cf::client cf::player 288 cf::client cf::player
247 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
248 cf::map cf::party cf::region 291 cf::party cf::region
249)) { 292)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 294}
253 295
254$EV::DIED = sub { 296$EV::DIED = sub {
255 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
256}; 298};
257 299
258############################################################################# 300#############################################################################
259 301
260=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
297our $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
298 340
299sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 358=item cf::lock_wait $string
303 359
304Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
305 361
306=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
307 363
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
311returned. 367returned.
312 368
313Locks 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
314deadlocked coro. 370deadlocked coro.
320 376
321Return 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.
322 378
323=cut 379=cut
324 380
325our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 382
328sub lock_wait($) { 383sub lock_wait($) {
329 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 385}
342 386
343sub lock_acquire($) { 387sub lock_acquire($) {
344 my ($key) = @_; 388 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 389}
358 390
359sub lock_active($) { 391sub lock_active($) {
360 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 393}
364 394
365sub freeze_mainloop { 395sub freeze_mainloop {
366 tick_inhibit_inc; 396 tick_inhibit_inc;
367 397
368 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
369} 399}
370 400
371=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
372 402
373Like 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
374get spread over timer. 404get spread over time.
375 405
376=cut 406=cut
377 407
378sub periodic($$) { 408sub periodic($$) {
379 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
396 426
397=cut 427=cut
398 428
399our @SLOT_QUEUE; 429our @SLOT_QUEUE;
400our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
401 432
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
405 436
406 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
407 439
408 while () { 440 while () {
409 next_job: 441 next_job:
442
410 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 444
412 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 449 $job->[2]->send;
416 Coro::cede; 450 Coro::cede;
417 goto next_job; 451 goto next_job;
418 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 454 }
420 } 455 }
421 456
422 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
423 # 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
424 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 460 $signal->wait;
426 } else { 461 } else {
462 $busy = 0;
427 Coro::schedule; 463 Coro::schedule;
428 } 464 }
429 } 465 }
430}; 466};
431 467
432sub get_slot($;$$) { 468sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
434 470
435 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
436 472
437 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
438 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
439 476
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
469 506
470sub sync_job(&) { 507sub sync_job(&) {
471 my ($job) = @_; 508 my ($job) = @_;
472 509
473 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
474 my $time = EV::time; 511 my $time = AE::time;
475 512
476 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
478 515
479 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
496 } else { 533 } else {
497 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
498 } 535 }
499 } 536 }
500 537
501 my $time = EV::time - $time; 538 my $time = AE::time - $time;
502 539
503 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
504 541
505 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
506 } else { 543 } else {
550 reset_signals; 587 reset_signals;
551 &$cb 588 &$cb
552 }, @args; 589 }, @args;
553 590
554 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 )
555} 603}
556 604
557=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
558 606
559=cut 607=cut
725 773
726############################################################################# 774#############################################################################
727 775
728=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
729 777
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
733 781
734In 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>
735C<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
785=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
786 834
787Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
789 837
790Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 840
793These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
794 842
795=over 4 843=over 4
1086 1134
1087sub reattach { 1135sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1137 my ($obj) = @_;
1090 1138
1139 # no longer needed after getting rid of delete_package?
1091 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
1092 1141
1093 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1094 1143
1095 @$registry = (); 1144 @$registry = ();
1096 1145
1144 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1145 1194
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 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 }
1150 aio_close $fh; 1202 aio_close $fh;
1151 1203
1152 if (@$objs) { 1204 if (@$objs) {
1153 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) {
1154 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1157 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 }
1158 aio_close $fh; 1213 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1215 }
1161 } else { 1216 } else {
1162 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1163 } 1218 }
1164 1219
1165 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1224 } else {
1167 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1168 } 1226 }
1169 } else { 1227 } else {
1170 aio_unlink $filename; 1228 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1172 } 1230 }
1263 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1264 1322
1265 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1266} 1324}
1267 1325
1326use File::Glob ();
1327
1268cf::player->attach ( 1328cf::player->attach (
1269 on_command => sub { 1329 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1271 1331
1272 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1273 or return; 1333 or return;
1274 1334
1304 1364
1305 cf::override; 1365 cf::override;
1306 }, 1366 },
1307); 1367);
1308 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
1309sub load_extensions { 1382sub load_extensions {
1310 cf::sync_job { 1383 cf::sync_job {
1311 my %todo; 1384 my %todo;
1312 1385
1313 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1332 1405
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1408
1336 $ext{source} = 1409 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1339 . $source 1412 . $source
1340 . "\n};\n1"; 1413 . "\n};\n1";
1341 1414
1342 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1343 } 1416 }
1344 1417
1418 my $pass = 0;
1345 my %done; 1419 my %done;
1346 while (%todo) { 1420 while (%todo) {
1347 my $progress; 1421 my $progress;
1348 1422
1423 ++$pass;
1424
1425 ext:
1349 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1428 next ext
1352 unless exists $done{$_}; 1429 unless exists $done{$_};
1353 } 1430 }
1354 1431
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1433
1357 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1438
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1440 if exists $v->{meta}{mandatory};
1365 1441
1366 warn $msg; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1443 delete $todo{$k};
1444 } else {
1445 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1367 } 1451 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1452 }
1373 1453
1374 skip: 1454 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1377 } 1462 }
1378 }; 1463 };
1379} 1464}
1380 1465
1381############################################################################# 1466#############################################################################
1382 1467
1383=back 1468=back
1384 1469
1385=head2 CORE EXTENSIONS 1470=head2 CORE EXTENSIONS
1386 1471
1387Functions and methods that extend core crossfire objects. 1472Functions and methods that extend core deliantra objects.
1388 1473
1389=cut 1474=cut
1390 1475
1391package cf::player; 1476package cf::player;
1392 1477
1435 1520
1436sub exists($) { 1521sub exists($) {
1437 my ($login) = @_; 1522 my ($login) = @_;
1438 1523
1439 $cf::PLAYER{$login} 1524 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1525 or !aio_stat path $login
1441} 1526}
1442 1527
1443sub find($) { 1528sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1529 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1530 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1466 } 1551 }
1467 } 1552 }
1468} 1553}
1469 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1470sub save($) { 1568sub save($) {
1471 my ($pl) = @_; 1569 my ($pl) = @_;
1472 1570
1473 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1474 1572
1479 1577
1480 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1482 1580
1483 cf::get_slot 0.01; 1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1585
1485 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1587 cf::cede_to_tick;
1487} 1588}
1488 1589
1520 my ($pl) = @_; 1621 my ($pl) = @_;
1521 1622
1522 my $name = $pl->ob->name; 1623 my $name = $pl->ob->name;
1523 1624
1524 $pl->{deny_save} = 1; 1625 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1627
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1629 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1631 $pl->ob->check_score;
1616 } 1717 }
1617 1718
1618 \@paths 1719 \@paths
1619} 1720}
1620 1721
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1722=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1723
1623Expand crossfire pod fragments into protocol xml. 1724Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1725
1714=item $player->ext_reply ($msgid, @msg) 1726=item $player->ext_reply ($msgid, @msg)
1715 1727
1716Sends an ext reply to the player. 1728Sends an ext reply to the player.
1717 1729
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1803
1792 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1805 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1930 1942
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1944 "$UNIQUEDIR/$path"
1933} 1945}
1934 1946
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1947sub decay_objects {
1945 my ($self) = @_; 1948 my ($self) = @_;
1946 1949
1947 return if $self->{deny_reset}; 1950 return if $self->{deny_reset};
1948 1951
2030sub find { 2033sub find {
2031 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
2032 2035
2033 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
2034 2037
2035 cf::lock_wait "map_data:$path";#d#remove 2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2040
2038 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
2043 or return; 2043 or return;
2044 2044
2045 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
2046 2046
2058 2058
2059 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
2060 } 2060 }
2061} 2061}
2062 2062
2063sub pre_load { } 2063sub pre_load { }
2064sub post_load { } 2064#sub post_load { } # XS
2065 2065
2066sub load { 2066sub load {
2067 my ($self) = @_; 2067 my ($self) = @_;
2068 2068
2069 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2087 $f->skip_block;
2088 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2089 or return; 2089 or return;
2090 2090
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2092 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2093 2093
2094 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2095 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2115 $self->decay_objects;
2116 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
2117 $self->update_buttons; 2117 $self->update_buttons;
2118 cf::cede_to_tick; 2118 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2119 $self->activate;
2122 } 2120 }
2123 2121
2124 $self->{last_save} = $cf::RUNTIME; 2122 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2123 $self->last_access ($cf::RUNTIME);
2128 } 2126 }
2129 2127
2130 $self->post_load; 2128 $self->post_load;
2131} 2129}
2132 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
2133sub customise_for { 2134sub customise_for {
2134 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
2135 2136
2136 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2138 if $self->per_player;
2214 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2215 2216
2216 () 2217 ()
2217} 2218}
2218 2219
2220# common code, used by both ->save and ->swapout
2219sub save { 2221sub _save {
2220 my ($self) = @_; 2222 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2223
2224 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2225 2225
2226 return unless $self->dirty; 2226 return unless $self->dirty;
2227 2227
2247 } else { 2247 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2249 }
2250} 2250}
2251 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2252sub swap_out { 2260sub swap_out {
2253 my ($self) = @_; 2261 my ($self) = @_;
2254 2262
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2264
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2265 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2266 return if $self->{deny_save};
2267 return if $self->players;
2263 2268
2264 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2265
2266 $self->deactivate; 2270 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2268 $self->clear; 2278 $self->clear;
2269} 2279}
2270 2280
2271sub reset_at { 2281sub reset_at {
2272 my ($self) = @_; 2282 my ($self) = @_;
2291 2301
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2303
2294 return if $self->players; 2304 return if $self->players;
2295 2305
2296 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2297 2307
2298 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2299 2309
2300 # need to save uniques path 2310 # need to save uniques path
2301 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
2392 : normalise $_ 2402 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2404 ]
2395} 2405}
2396 2406
2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2438
2397=back 2439=back
2398 2440
2399=head3 cf::object 2441=head3 cf::object
2400 2442
2401=cut 2443=cut
2466 2508
2467our $SAY_CHANNEL = { 2509our $SAY_CHANNEL = {
2468 id => "say", 2510 id => "say",
2469 title => "Map", 2511 title => "Map",
2470 reply => "say ", 2512 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2513 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2514};
2473 2515
2474our $CHAT_CHANNEL = { 2516our $CHAT_CHANNEL = {
2475 id => "chat", 2517 id => "chat",
2476 title => "Chat", 2518 title => "Chat",
2531 2573
2532=item $player_object->enter_link 2574=item $player_object->enter_link
2533 2575
2534Freezes the player and moves him/her to a special map (C<{link}>). 2576Freezes the player and moves him/her to a special map (C<{link}>).
2535 2577
2536The player should be reasonably safe there for short amounts of time. You 2578The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2579for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link
2581map.
2538 2582
2539Will never block. 2583Will never block.
2540 2584
2541=item $player_object->leave_link ($map, $x, $y) 2585=item $player_object->leave_link ($map, $x, $y)
2542 2586
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2612
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2571 2615
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2617}
2574 2618
2575sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2577 2621
2594 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2596 2640
2597 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2600 2644
2601 $map->load; 2645 $map->load;
2602 $map->load_neighbours; 2646 $map->load_neighbours;
2603 2647
2604 return unless $self->contr->active; 2648 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2649
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2651 $self->enter_map ($map, $x, $y);
2652
2653 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive;
2609} 2655}
2610 2656
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2658
2613Moves the player to the given map-path and coordinates by first freezing 2659Moves the player to the given map-path and coordinates by first freezing
2772 $self->contr->savebed ($map, $x, $y) 2818 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2819 if $exit->flag (cf::FLAG_DAMNED);
2774 2820
2775 1 2821 1
2776 }) { 2822 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2823 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2824 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2825 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2826 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2827
2782 warn "ERROR in enter_exit: $@"; 2828 warn "ERROR in enter_exit: $@";
2799sub cf::client::send_drawinfo { 2845sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2846 my ($self, $text, $flags) = @_;
2801 2847
2802 utf8::encode $text; 2848 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2850}
2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2804} 2875}
2805 2876
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2878
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send a drawinfo or msg packet to the client, formatting the msg for the
2812 2883
2813=cut 2884=cut
2814 2885
2815# non-persistent channels (usually the info channel) 2886# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2817 "c/identify" => { 2894 "c/identify" => {
2818 id => "infobox", 2895 id => "infobox",
2819 title => "Identify", 2896 title => "Identify",
2820 reply => undef, 2897 reply => undef,
2821 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
2823 "c/examine" => { 2900 "c/examine" => {
2824 id => "infobox", 2901 id => "infobox",
2825 title => "Examine", 2902 title => "Examine",
2826 reply => undef, 2903 reply => undef,
2827 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2911 },
2829 "c/book" => { 2912 "c/book" => {
2830 id => "infobox", 2913 id => "infobox",
2831 title => "Book", 2914 title => "Book",
2832 reply => undef, 2915 reply => undef,
2848 id => "infobox", 2931 id => "infobox",
2849 title => "Body Parts", 2932 title => "Body Parts",
2850 reply => undef, 2933 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2934 tooltip => "Shows which body parts you posess and are available",
2852 }, 2935 },
2936 "c/statistics" => {
2937 id => "infobox",
2938 title => "Statistics",
2939 reply => undef,
2940 tooltip => "Shows your primary statistics",
2941 },
2942 "c/skills" => {
2943 id => "infobox",
2944 title => "Skills",
2945 reply => undef,
2946 tooltip => "Shows your experience per skill and item power",
2947 },
2948 "c/shopitems" => {
2949 id => "infobox",
2950 title => "Shop Items",
2951 reply => undef,
2952 tooltip => "Shows the items currently for sale in this shop",
2953 },
2954 "c/resistances" => {
2955 id => "infobox",
2956 title => "Resistances",
2957 reply => undef,
2958 tooltip => "Shows your resistances",
2959 },
2960 "c/pets" => {
2961 id => "infobox",
2962 title => "Pets",
2963 reply => undef,
2964 tooltip => "Shows information abotu your pets/a specific pet",
2965 },
2966 "c/perceiveself" => {
2967 id => "infobox",
2968 title => "Perceive Self",
2969 reply => undef,
2970 tooltip => "You gained detailed knowledge about yourself",
2971 },
2853 "c/uptime" => { 2972 "c/uptime" => {
2854 id => "infobox", 2973 id => "infobox",
2855 title => "Uptime", 2974 title => "Uptime",
2856 reply => undef, 2975 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2976 tooltip => "How long the server has been running since last restart",
2866 id => "party", 2985 id => "party",
2867 title => "Party", 2986 title => "Party",
2868 reply => "gsay ", 2987 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 2988 tooltip => "Messages and chat related to your party",
2870 }, 2989 },
2990 "c/death" => {
2991 id => "death",
2992 title => "Death",
2993 reply => undef,
2994 tooltip => "Reason for and more info about your most recent death",
2995 },
2996 "c/say" => $SAY_CHANNEL,
2997 "c/chat" => $CHAT_CHANNEL,
2871); 2998);
2872 2999
2873sub cf::client::send_msg { 3000sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3001 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3002
2876 $msg = $self->pl->expand_cfpod ($msg); 3003 $msg = $self->pl->expand_cfpod ($msg)
3004 unless $color & cf::NDI_VERBATIM;
2877 3005
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3006 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3007
2880 # check predefined channels, for the benefit of C 3008 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3009 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3010 $channel = $CHANNEL{$channel};
2883 3011
2884 $self->ext_msg (channel_info => $channel) 3012 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3013 $channel = $channel->{id};
2888 3014
2889 } elsif (ref $channel) { 3015 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3016 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3017 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3018 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3019 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3020 }
2896 3021
2897 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2898 } 3023 }
2899 3024
2900 return unless @extra || length $msg; 3025 return unless @extra || length $msg;
2901 3026
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3027 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3028 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3029 if $color & cf::NDI_DEF;
2906 3030
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3031 my $pkt = "msg "
3032 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3034 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3035
2921 $color &= cf::NDI_COLOR_MASK; 3036 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3037}
2935 3038
2936=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2937 3040
2938Sends an ext event to the client. 3041Sends an ext event to the client.
2941 3044
2942sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2944 3047
2945 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3053 }
2951} 3054}
2952 3055
2953=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2954 3057
2958 3061
2959sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2961 3064
2962 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3068 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3071 }
2969} 3072}
2970 3073
2971=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2972 3075
3073 3176
3074 $coro 3177 $coro
3075} 3178}
3076 3179
3077cf::client->attach ( 3180cf::client->attach (
3078 on_destroy => sub { 3181 on_client_destroy => sub {
3079 my ($ns) = @_; 3182 my ($ns) = @_;
3080 3183
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3185 },
3083); 3186);
3099our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
3100 3203
3101$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
3102 3205
3103$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
3106 sort time 3209 sort time
3107)); 3210));
3108 3211
3109# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
3113The following functions and methods are available within a safe environment: 3216The following functions and methods are available within a safe environment:
3114 3217
3115 cf::object 3218 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3219 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3220 insert remove name archname title slaying race decrease split
3221 value
3118 3222
3119 cf::object::player 3223 cf::object::player
3120 player 3224 player
3121 3225
3122 cf::player 3226 cf::player
3128=cut 3232=cut
3129 3233
3130for ( 3234for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3235 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3236 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3237 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3238 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3239 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3240 ["cf::map" => qw(trigger)],
3137) { 3241) {
3138 no strict 'refs'; 3242 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3243 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3158 3262
3159 my $qcode = $code; 3263 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
3162 3266
3267 %vars = (_dummy => 0) unless %vars;
3268
3269 my @res;
3163 local $_; 3270 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3271
3166 my $eval = 3272 my $eval =
3167 "do {\n" 3273 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3276 . $code
3171 . "\n}" 3277 . "\n}"
3172 ; 3278 ;
3173 3279
3280 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
3177 3289
3178 if ($@) { 3290 if ($@) {
3179 warn "$@"; 3291 warn "$@";
3180 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
3200=cut 3312=cut
3201 3313
3202sub register_script_function { 3314sub register_script_function {
3203 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
3204 3316
3205 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
3207} 3319}
3208 3320
3209=back 3321=back
3210 3322
3211=cut 3323=cut
3232 3344
3233 $facedata->{version} == 2 3345 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3347
3236 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3351 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3354 };
3241 cf::cede_to_tick; 3355 cf::cede_to_tick;
3242 3356
3243 { 3357 {
3244 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
3246 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3362
3249 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3367
3254 cf::cede_to_tick; 3368 cf::cede_to_tick;
3255 } 3369 }
3256 3370
3257 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
3281 3395
3282 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3283 } 3397 }
3284 3398
3285 { 3399 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3289 3401
3290 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3403 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3405
3295 if ($info->{type} & 1) { 3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3407 cf::face::set_type $idx, $info->{type};
3310 } else { 3408 } else {
3311 $RESOURCE{$name} = $info; 3409 $RESOURCE{$name} = $info;
3312 } 3410 }
3313 3411
3396 reload_treasures; 3494 reload_treasures;
3397 3495
3398 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3399} 3497}
3400 3498
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3503 or return;
3412 3504
3413 local $/; 3505 local $/;
3414 *CFG = YAML::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3415 3507
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3417 3509
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3423 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3425 }; 3517 };
3426 warn $@ if $@; 3518 warn $@ if $@;
3427 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3522}
3523
3524sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!";
3527 flock $fh, &Fcntl::LOCK_EX
3528 or die "$PIDFILE: flock: $!";
3529 $fh
3530}
3531
3532# make sure only one server instance is running at any one time
3533sub atomic {
3534 my $fh = pidfile;
3535
3536 my $pid = <$fh>;
3537 kill 9, $pid if $pid > 0;
3538
3539 seek $fh, 0, 0;
3540 print $fh $$;
3541}
3542
3543sub main_loop {
3544 warn "EV::loop starting\n";
3545 if (1) {
3546 EV::loop;
3547 }
3548 warn "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP;
3428} 3550}
3429 3551
3430sub main { 3552sub main {
3553 cf::init_globals; # initialise logging
3554
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561
3431 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3564 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3565 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3566 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3567 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3568 })->prio (Coro::PRIO_MAX);
3438 }; 3569 };
3439 3570
3440 { 3571 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3572
3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3582 reload_resources;
3442 reload_config; 3583 reload_config;
3443 db_init; 3584 db_init;
3585
3586 cf::init_uuid;
3587 cf::init_signals;
3588 cf::init_skills;
3589
3590 cf::init_beforeplay;
3591
3592 atomic;
3593
3444 load_extensions; 3594 load_extensions;
3445 3595
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3596 utime time, time, $RUNTIMEFILE;
3597
3598 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601
3602 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3603 };
3448 3604
3449 EV::loop; 3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3607
3608 main_loop;
3450} 3609}
3451 3610
3452############################################################################# 3611#############################################################################
3453# initialisation and cleanup 3612# initialisation and cleanup
3454 3613
3455# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3456BEGIN { 3615BEGIN {
3457 our %SIGWATCHER = (); 3616 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3618 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3619 cf::cleanup "SIG$signal";
3461 }; 3620 };
3462 } 3621 }
3463} 3622}
3464 3623
3465sub write_runtime_sync { 3624sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3625 my $t0 = AE::time;
3467 3626
3468 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3470 3629
3471 IO::AIO::aio_utime $runtime, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3631
3473 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3474 3633
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3635 or return;
3477 3636
3478 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 3649 aio_utime $fh, undef, undef;
3491 3650
3492 close $fh 3651 close $fh
3493 or return; 3652 or return;
3494 3653
3495 aio_rename "$runtime~", $runtime 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3655 and return;
3497 3656
3498 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3658
3500 1 3659 1
3501} 3660}
3502 3661
3503our $uuid_lock; 3662our $uuid_lock;
3512 my $uuid = "$LOCALDIR/uuid"; 3671 my $uuid = "$LOCALDIR/uuid";
3513 3672
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3673 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3674 or return;
3516 3675
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3676 my $value = uuid_seq uuid_cur;
3677
3678 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n";
3680 return;
3681 }
3682
3683 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3684 $uuid_skip = 0;
3519 3685
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3686 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3687 and return;
3522 3688
3544} 3710}
3545 3711
3546sub emergency_save() { 3712sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3713 my $freeze_guard = cf::freeze_mainloop;
3548 3714
3549 warn "enter emergency perl save\n"; 3715 warn "emergency_perl_save: enter\n";
3550 3716
3551 cf::sync_job { 3717 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722
3552 # use a peculiar iteration method to avoid tripping on perl 3723 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3724 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3725 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3726 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3727 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3728 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3729 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3731 $pl->save;
3561 } 3732 }
3562 warn "end emergency player save\n"; 3733 warn "emergency_perl_save: end player save\n";
3563 3734
3564 warn "begin emergency map save\n"; 3735 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3736 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3737 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3738 $map->valid or next;
3568 $map->save; 3739 $map->save;
3569 } 3740 }
3570 warn "end emergency map save\n"; 3741 warn "emergency_perl_save: end map save\n";
3571 3742
3572 warn "begin emergency database checkpoint\n"; 3743 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3745 warn "emergency_perl_save: end database checkpoint\n";
3575 3746
3576 warn "begin write uuid\n"; 3747 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3748 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3749 warn "emergency_perl_save: end write uuid\n";
3579 }; 3750 };
3580 3751
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3581 warn "leave emergency perl save\n"; 3757 warn "emergency_perl_save: leave\n";
3582} 3758}
3583 3759
3584sub post_cleanup { 3760sub post_cleanup {
3585 my ($make_core) = @_; 3761 my ($make_core) = @_;
3586 3762
3587 warn Carp::longmess "post_cleanup backtrace" 3763 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3764 if $make_core;
3765
3766 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$;
3768}
3769
3770# a safer delete_package, copied from Symbol
3771sub clear_package($) {
3772 my $pkg = shift;
3773
3774 # expand to full symbol table name if needed
3775 unless ($pkg =~ /^main::.*::$/) {
3776 $pkg = "main$pkg" if $pkg =~ /^::/;
3777 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3778 $pkg .= '::' unless $pkg =~ /::$/;
3779 }
3780
3781 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3782 my $stem_symtab = *{$stem}{HASH};
3783
3784 defined $stem_symtab and exists $stem_symtab->{$leaf}
3785 or return;
3786
3787 # clear all symbols
3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3789 for my $name (keys %$leaf_symtab) {
3790 _gv_clear *{"$pkg$name"};
3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3792 }
3589} 3793}
3590 3794
3591sub do_reload_perl() { 3795sub do_reload_perl() {
3592 # can/must only be called in main 3796 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3798 warn "can only reload from main coroutine";
3595 return; 3799 return;
3596 } 3800 }
3597 3801
3802 return if $RELOAD++;
3803
3804 my $t1 = AE::time;
3805
3806 while ($RELOAD) {
3598 warn "reloading..."; 3807 warn "reloading...";
3599 3808
3600 warn "entering sync_job"; 3809 warn "entering sync_job";
3601 3810
3602 cf::sync_job { 3811 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3813 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3814 cf::write_runtime_sync; # external watchdog should not bark
3606 3815
3607 warn "syncing database to disk"; 3816 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3817 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3818
3610 # if anything goes wrong in here, we should simply crash as we already saved 3819 # if anything goes wrong in here, we should simply crash as we already saved
3611 3820
3612 warn "flushing outstanding aio requests"; 3821 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3822 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3824 }
3644 3825
3645 warn "... nuking $pkg"; 3826 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3827 $_->cancel for values %EXT_CORO;
3647 } 3828 %EXT_CORO = ();
3648 3829
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3830 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3831 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3832
3833 warn "removing ext/exti commands";
3834 %EXTCMD = ();
3835 %EXTICMD = ();
3836
3837 warn "unloading/nuking all extensions";
3838 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3839 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3840
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3841 if (my $cb = $pkg->can ("unload")) {
3842 eval {
3660 $cb->(); 3843 $cb->($pkg);
3844 1
3845 } or warn "$pkg unloaded, but with errors: $@";
3846 }
3847
3848 warn "... clearing $pkg";
3849 clear_package $pkg;
3661 } 3850 }
3662 3851
3663 Symbol::delete_package $k; 3852 warn "unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855
3856 warn "... unloading $k";
3857 delete $INC{$k};
3858
3859 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g;
3861
3862 if (my $cb = $k->can ("unload_module")) {
3863 $cb->();
3864 }
3865
3866 clear_package $k;
3664 } 3867 }
3665 3868
3666 warn "getting rid of safe::, as good as possible"; 3869 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3870 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3872
3670 warn "unloading cf.pm \"a bit\""; 3873 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3874 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3876
3674 # don't, removes xs symbols, too, 3877 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3878 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3879 #clear_package __PACKAGE__;
3677 3880
3678 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3679 3882
3680 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3681 require cf; 3884 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3683 3886
3684 warn "loading config and database again"; 3887 warn "loading config and database again";
3685 cf::reload_config; 3888 cf::reload_config;
3686 3889
3687 warn "loading extensions"; 3890 warn "loading extensions";
3688 cf::load_extensions; 3891 cf::load_extensions;
3689 3892
3893 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3894 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3895 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3896 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3897 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3898 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3899 reattach $_ for values %PLAYER;
3900 }
3696 3901
3902 warn "running post_init jobs";
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904
3697 warn "leaving sync_job"; 3905 warn "leaving sync_job";
3698 3906
3699 1 3907 1
3700 } or do { 3908 } or do {
3701 warn $@; 3909 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3910 cf::cleanup "error while reloading, exiting.";
3703 }; 3911 };
3704 3912
3705 warn "reloaded"; 3913 warn "reloaded";
3914 --$RELOAD;
3915 }
3916
3917 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n";
3706}; 3919};
3707 3920
3708our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3709 3922
3710sub reload_perl() { 3923sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3924 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3713 3926
3927 $RELOAD_WATCHER ||= cf::async {
3928 Coro::AIO::aio_wait cache_extensions;
3929
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3931 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3933 };
3717 }; 3934 };
3718} 3935}
3719 3936
3720register_command "reload" => sub { 3937register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3938 my ($who, $arg) = @_;
3735 3952
3736our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3738 3955
3739sub wait_for_tick { 3956sub wait_for_tick {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 3958
3742 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 3961 $signal->wait;
3745} 3962}
3746 3963
3747sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 3966
3750 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 3969 $signal->wait;
3753} 3970}
3758 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3759 return; 3976 return;
3760 } 3977 }
3761 3978
3762 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3980
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3763 3982
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 3985 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
3790} 4009}
3791 4010
3792{ 4011{
3793 # configure BDB 4012 # configure BDB
3794 4013
3795 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4016 $AnyEvent::BDB::WATCHER->priority (1);
3798 4017
3799 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
3847 $msg =~ s/\n//; 4066 $msg =~ s/\n//;
3848 4067
3849 # limit the # of concurrent backtraces 4068 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4069 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 4070 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg;
3852 async { 4072 async {
3853 $Coro::current->{desc} = "abt $msg"; 4073 $Coro::current->{desc} = "abt $msg";
3854 4074
3855 my @bt = fork_call { 4075 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4076 @addr = map { sprintf "%x", $_ } @addr;
3867 } 4087 }
3868 4088
3869 @funcs 4089 @funcs
3870 }; 4090 };
3871 4091
3872 LOG llevInfo, "[ABT] $msg\n"; 4092 LOG llevInfo, "[ABT] $perl_bt\n";
4093 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4094 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4095 --$_log_backtrace;
3875 }; 4096 };
3876 } else { 4097 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4098 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4099 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4100 }
3880} 4101}
3881 4102
3882# load additional modules 4103# load additional modules
3883use cf::pod; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3884 4106
3885END { cf::emergency_save } 4107END { cf::emergency_save }
3886 4108
38871 41091
3888 4110

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines