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.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 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
1141 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
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 chmod SAVE_MODE, $fh; 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 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 chmod SAVE_MODE, $fh; 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 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];
1456 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1540 or return;
1458 1541
1459 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1460 or return; 1543 or return;
1544
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1464 } 1548 }
1465 } 1549 }
1466} 1550}
1467 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
1468sub save($) { 1565sub save($) {
1469 my ($pl) = @_; 1566 my ($pl) = @_;
1470 1567
1471 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1472 1569
1477 1574
1478 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1480 1577
1481 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];
1482 1582
1483 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1584 cf::cede_to_tick;
1485} 1585}
1486 1586
1518 my ($pl) = @_; 1618 my ($pl) = @_;
1519 1619
1520 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1521 1621
1522 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1523 $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
1524 1624
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1529 1631
1530 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1672
1571 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1572 my $path = path $login; 1674 my $path = path $login;
1573 1675
1574 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1682 }
1580 1683
1611 } 1714 }
1612 1715
1613 \@paths 1716 \@paths
1614} 1717}
1615 1718
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1720
1618Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1722
1709=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1710 1724
1711Sends an ext reply to the player. 1725Sends an ext reply to the player.
1712 1726
1785 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
1786 1800
1787 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1802 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1925 1939
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1928} 1942}
1929 1943
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1944sub decay_objects {
1940 my ($self) = @_; 1945 my ($self) = @_;
1941 1946
1942 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1943 1948
2025sub find { 2030sub find {
2026 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
2027 2032
2028 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
2029 2034
2030 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2037
2033 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
2038 or return; 2040 or return;
2039 2041
2040 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2041 2043
2043 or return; 2045 or return;
2044 2046
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2048 undef $guard1; 2051 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2052 $map->reset;
2051 return find $path; 2053 return find $path;
2052 } 2054 }
2053 2055
2054 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2055 } 2057 }
2056} 2058}
2057 2059
2058sub pre_load { } 2060sub pre_load { }
2059sub post_load { } 2061#sub post_load { } # XS
2060 2062
2061sub load { 2063sub load {
2062 my ($self) = @_; 2064 my ($self) = @_;
2063 2065
2064 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2084 $f->skip_block;
2083 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2084 or return; 2086 or return;
2085 2087
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2087 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2088 2090
2089 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2092 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2112 $self->decay_objects;
2111 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2112 $self->update_buttons; 2114 $self->update_buttons;
2113 cf::cede_to_tick; 2115 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2116 $self->activate;
2117 } 2117 }
2118 2118
2119 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2123 } 2123 }
2124 2124
2125 $self->post_load; 2125 $self->post_load;
2126} 2126}
2127 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
2128sub customise_for { 2131sub customise_for {
2129 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2130 2133
2131 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2135 if $self->per_player;
2286 2289
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2291
2289 return if $self->players; 2292 return if $self->players;
2290 2293
2291 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2292 2295
2293 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2294 2297
2295 # need to save uniques path 2298 # need to save uniques path
2296 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2387 : normalise $_ 2390 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2392 ]
2390} 2393}
2391 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
2392=back 2427=back
2393 2428
2394=head3 cf::object 2429=head3 cf::object
2395 2430
2396=cut 2431=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2493dialogue with the given NPC character.
2459 2494
2460=cut 2495=cut
2461 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2462# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2512# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2528
2480 } else { 2529 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2532 }
2484 } 2533 }
2485} 2534}
2486 2535
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2561
2513=item $player_object->enter_link 2562=item $player_object->enter_link
2514 2563
2515Freezes 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}>).
2516 2565
2517The 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.
2518I<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.
2519 2570
2520Will never block. 2571Will never block.
2521 2572
2522=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2523 2574
2575 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2577 2628
2578 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2581 2632
2582 $map->load; 2633 $map->load;
2583 $map->load_neighbours; 2634 $map->load_neighbours;
2584 2635
2585 return unless $self->contr->active; 2636 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2637
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $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;
2590} 2643}
2591 2644
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2646
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2655
2600=cut 2656=cut
2601 2657
2602our $GOTOGEN; 2658our $GOTOGEN;
2603 2659
2682} 2738}
2683 2739
2684sub prepare_random_map { 2740sub prepare_random_map {
2685 my ($exit) = @_; 2741 my ($exit) = @_;
2686 2742
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2745 # that depends on the exit object
2692 2746
2693 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2749 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2700 } 2756 }
2701 2757
2702 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2703 2759
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2766 undef $fh;
2711 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2712 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2715 } 2775 }
2716} 2776}
2717 2777
2718sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2720 2780
2721 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2722 2782
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2783 $self->enter_link;
2735 2784
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2785 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2786 $Coro::current->{desc} = "enter_exit";
2742 2787
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2746 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
2747 1; 2809 1
2748 }) { 2810 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2815
2754 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2771sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2773 2835
2774 utf8::encode $text; 2836 utf8::encode $text;
2775 $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);
2776} 2863}
2777 2864
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2866
2780Send 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
2784 2871
2785=cut 2872=cut
2786 2873
2787# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2789 "c/identify" => { 2882 "c/identify" => {
2790 id => "infobox", 2883 id => "infobox",
2791 title => "Identify", 2884 title => "Identify",
2792 reply => undef, 2885 reply => undef,
2793 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2795 "c/examine" => { 2888 "c/examine" => {
2796 id => "infobox", 2889 id => "infobox",
2797 title => "Examine", 2890 title => "Examine",
2798 reply => undef, 2891 reply => undef,
2799 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",
2800 }, 2899 },
2801 "c/book" => { 2900 "c/book" => {
2802 id => "infobox", 2901 id => "infobox",
2803 title => "Book", 2902 title => "Book",
2804 reply => undef, 2903 reply => undef,
2820 id => "infobox", 2919 id => "infobox",
2821 title => "Body Parts", 2920 title => "Body Parts",
2822 reply => undef, 2921 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2824 }, 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 },
2825 "c/uptime" => { 2960 "c/uptime" => {
2826 id => "infobox", 2961 id => "infobox",
2827 title => "Uptime", 2962 title => "Uptime",
2828 reply => undef, 2963 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2838 id => "party", 2973 id => "party",
2839 title => "Party", 2974 title => "Party",
2840 reply => "gsay ", 2975 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2842 }, 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,
2843); 2986);
2844 2987
2845sub cf::client::send_msg { 2988sub cf::client::send_msg {
2846 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2847 2990
2848 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2849 2993
2850 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2851 2995
2852 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2853 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2855 2999
2856 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2860 3002
2861 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2862 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2863 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2864 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2865 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2866 if $self->can_msg;
2867 } 3008 }
2868 3009
2869 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2870 } 3011 }
2871 3012
2872 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2873 3014
2874 if ($self->can_msg) {
2875 # default colour, mask it out 3015 # default colour, mask it out
2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2878 3018
2879 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2880 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2881 } else { 3022 );
2882 if ($color >= 0) {
2883 # replace some tags by gcfclient-compatible ones
2884 for ($msg) {
2885 1 while
2886 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2887 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2888 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2889 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2890 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2891 }
2892 3023
2893 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2894
2895 utf8::encode $msg;
2896
2897 if (0 && $msg =~ /\[/) {
2898 # COMMAND/INFO
2899 $self->send_packet ("drawextinfo $color 10 8 $msg")
2900 } else {
2901 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2902 $self->send_packet ("drawinfo $color $msg")
2903 }
2904 }
2905 }
2906} 3025}
2907 3026
2908=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2909 3028
2910Sends an ext event to the client. 3029Sends an ext event to the client.
2913 3032
2914sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2915 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2916 3035
2917 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2919 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2920 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2921 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2922 } 3041 }
2923} 3042}
2924 3043
2925=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2926 3045
2930 3049
2931sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2932 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2933 3052
2934 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2936 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2937 #TODO: version 1, remove 3056 #TODO: version 1, remove
2938 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2939 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2940 } 3059 }
2941} 3060}
2942 3061
2943=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2944 3063
3045 3164
3046 $coro 3165 $coro
3047} 3166}
3048 3167
3049cf::client->attach ( 3168cf::client->attach (
3050 on_destroy => sub { 3169 on_client_destroy => sub {
3051 my ($ns) = @_; 3170 my ($ns) = @_;
3052 3171
3053 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3054 }, 3173 },
3055); 3174);
3071our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3072 3191
3073$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3074 3193
3075$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3076 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3077 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3078 sort time 3197 sort time
3079)); 3198));
3080 3199
3081# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3085The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3086 3205
3087 cf::object 3206 cf::object
3088 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
3089 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3090 3210
3091 cf::object::player 3211 cf::object::player
3092 player 3212 player
3093 3213
3094 cf::player 3214 cf::player
3099 3219
3100=cut 3220=cut
3101 3221
3102for ( 3222for (
3103 ["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
3104 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3105 decrease split destroy)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3106 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3107 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3108 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3109) { 3229) {
3110 no strict 'refs'; 3230 no strict 'refs';
3111 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3112 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3130 3250
3131 my $qcode = $code; 3251 my $qcode = $code;
3132 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3133 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3134 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3135 local $_; 3258 local $_;
3136 local @safe::cf::_safe_eval_args = values %vars;
3137 3259
3138 my $eval = 3260 my $eval =
3139 "do {\n" 3261 "do {\n"
3140 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3141 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3142 . $code 3264 . $code
3143 . "\n}" 3265 . "\n}"
3144 ; 3266 ;
3145 3267
3268 if ($CFG{safe_eval}) {
3146 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3147 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3148 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 }
3149 3277
3150 if ($@) { 3278 if ($@) {
3151 warn "$@"; 3279 warn "$@";
3152 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3153 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3172=cut 3300=cut
3173 3301
3174sub register_script_function { 3302sub register_script_function {
3175 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3176 3304
3177 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3178 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3179} 3307}
3180 3308
3181=back 3309=back
3182 3310
3183=cut 3311=cut
3204 3332
3205 $facedata->{version} == 2 3333 $facedata->{version} == 2
3206 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3207 3335
3208 # 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]);
3209 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3210 type => FT_RSRC, 3339 type => FT_RSRC,
3211 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),
3212 }; 3342 };
3213 cf::cede_to_tick; 3343 cf::cede_to_tick;
3214 3344
3215 { 3345 {
3216 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3218 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3219 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220 3350
3221 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3222 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3225 3355
3226 cf::cede_to_tick; 3356 cf::cede_to_tick;
3227 } 3357 }
3228 3358
3229 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3253 3383
3254 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3255 } 3385 }
3256 3386
3257 { 3387 {
3258 # TODO: for gcfclient pleasure, we should give resources
3259 # that gcfclient doesn't grok a >10000 face index.
3260 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3261 3389
3262 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3263 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3264 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3265 my $data;
3266 3393
3267 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3268 # prepend meta info
3269
3270 my $meta = $enc->encode ({
3271 name => $name,
3272 %{ $info->{meta} || {} },
3273 });
3274
3275 $data = pack "(w/a*)*", $meta, $info->{data};
3276 } else {
3277 $data = $info->{data};
3278 }
3279
3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3282 } else { 3396 } else {
3283 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3284 } 3398 }
3285 3399
3368 reload_treasures; 3482 reload_treasures;
3369 3483
3370 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3371} 3485}
3372 3486
3373sub init {
3374 my $guard = freeze_mainloop;
3375
3376 reload_resources;
3377}
3378
3379sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3380 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3381 or return; 3491 or return;
3382 3492
3383 local $/; 3493 local $/;
3384 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3385 3495
3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3387 3497
3388 $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};
3389 $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};
3393 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3394 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3395 }; 3505 };
3396 warn $@ if $@; 3506 warn $@ if $@;
3397 } 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;
3398} 3538}
3399 3539
3400sub 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 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3401 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3402 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3404 (async { 3553 (async {
3405 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT; 3555 EV::loop EV::LOOP_ONESHOT;
3407 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3408 }; 3557 };
3409 3558
3410 { 3559 evthread_start IO::AIO::poll_fileno;
3411 my $guard = freeze_mainloop; 3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3412 reload_config; 3571 reload_config;
3413 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
3414 load_extensions; 3582 load_extensions;
3415 3583
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3584 utime time, time, $RUNTIMEFILE;
3417 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;
3418 } 3591 };
3419 3592
3420 EV::loop; 3593 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n";
3595
3596 main_loop;
3421} 3597}
3422 3598
3423############################################################################# 3599#############################################################################
3424# initialisation and cleanup 3600# initialisation and cleanup
3425 3601
3426# install some emergency cleanup handlers 3602# install some emergency cleanup handlers
3427BEGIN { 3603BEGIN {
3428 our %SIGWATCHER = (); 3604 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3605 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3606 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3607 cf::cleanup "SIG$signal";
3432 }; 3608 };
3433 } 3609 }
3434} 3610}
3435 3611
3436sub write_runtime_sync { 3612sub write_runtime_sync {
3437 my $runtime = "$LOCALDIR/runtime"; 3613 my $t0 = AE::time;
3438 3614
3439 # first touch the runtime file to show we are still running: 3615 # first touch the runtime file to show we are still running:
3440 # the fsync below can take a very very long time. 3616 # the fsync below can take a very very long time.
3441 3617
3442 IO::AIO::aio_utime $runtime, undef, undef; 3618 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443 3619
3444 my $guard = cf::lock_acquire "write_runtime"; 3620 my $guard = cf::lock_acquire "write_runtime";
3445 3621
3446 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3622 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3447 or return; 3623 or return;
3448 3624
3449 my $value = $cf::RUNTIME + 90 + 10; 3625 my $value = $cf::RUNTIME + 90 + 10;
3450 # 10 is the runtime save interval, for a monotonic clock 3626 # 10 is the runtime save interval, for a monotonic clock
3451 # 60 allows for the watchdog to kill the server. 3627 # 60 allows for the watchdog to kill the server.
3461 aio_utime $fh, undef, undef; 3637 aio_utime $fh, undef, undef;
3462 3638
3463 close $fh 3639 close $fh
3464 or return; 3640 or return;
3465 3641
3466 aio_rename "$runtime~", $runtime 3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467 and return; 3643 and return;
3468 3644
3469 warn "runtime file written.\n"; 3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3470 3646
3471 1 3647 1
3472} 3648}
3473 3649
3474our $uuid_lock; 3650our $uuid_lock;
3483 my $uuid = "$LOCALDIR/uuid"; 3659 my $uuid = "$LOCALDIR/uuid";
3484 3660
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3661 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return; 3662 or return;
3487 3663
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3664 my $value = uuid_seq uuid_cur;
3665
3666 unless ($value) {
3667 warn "cowardly refusing to write zero uuid value!\n";
3668 return;
3669 }
3670
3671 my $value = uuid_str $value + $uuid_skip;
3489 $uuid_skip = 0; 3672 $uuid_skip = 0;
3490 3673
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3674 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return; 3675 and return;
3493 3676
3515} 3698}
3516 3699
3517sub emergency_save() { 3700sub emergency_save() {
3518 my $freeze_guard = cf::freeze_mainloop; 3701 my $freeze_guard = cf::freeze_mainloop;
3519 3702
3520 warn "enter emergency perl save\n"; 3703 warn "emergency_perl_save: enter\n";
3521 3704
3522 cf::sync_job { 3705 cf::sync_job {
3706 # this is a trade-off: we want to be very quick here, so
3707 # save all maps without fsync, and later call a global sync
3708 # (which in turn might be very very slow)
3709 local $USE_FSYNC = 0;
3710
3523 # use a peculiar iteration method to avoid tripping on perl 3711 # use a peculiar iteration method to avoid tripping on perl
3524 # refcount bugs in for. also avoids problems with players 3712 # refcount bugs in for. also avoids problems with players
3525 # and maps saved/destroyed asynchronously. 3713 # and maps saved/destroyed asynchronously.
3526 warn "begin emergency player save\n"; 3714 warn "emergency_perl_save: begin player save\n";
3527 for my $login (keys %cf::PLAYER) { 3715 for my $login (keys %cf::PLAYER) {
3528 my $pl = $cf::PLAYER{$login} or next; 3716 my $pl = $cf::PLAYER{$login} or next;
3529 $pl->valid or next; 3717 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3718 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3531 $pl->save; 3719 $pl->save;
3532 } 3720 }
3533 warn "end emergency player save\n"; 3721 warn "emergency_perl_save: end player save\n";
3534 3722
3535 warn "begin emergency map save\n"; 3723 warn "emergency_perl_save: begin map save\n";
3536 for my $path (keys %cf::MAP) { 3724 for my $path (keys %cf::MAP) {
3537 my $map = $cf::MAP{$path} or next; 3725 my $map = $cf::MAP{$path} or next;
3538 $map->valid or next; 3726 $map->valid or next;
3539 $map->save; 3727 $map->save;
3540 } 3728 }
3541 warn "end emergency map save\n"; 3729 warn "emergency_perl_save: end map save\n";
3542 3730
3543 warn "begin emergency database checkpoint\n"; 3731 warn "emergency_perl_save: begin database checkpoint\n";
3544 BDB::db_env_txn_checkpoint $DB_ENV; 3732 BDB::db_env_txn_checkpoint $DB_ENV;
3545 warn "end emergency database checkpoint\n"; 3733 warn "emergency_perl_save: end database checkpoint\n";
3546 3734
3547 warn "begin write uuid\n"; 3735 warn "emergency_perl_save: begin write uuid\n";
3548 write_uuid_sync 1; 3736 write_uuid_sync 1;
3549 warn "end write uuid\n"; 3737 warn "emergency_perl_save: end write uuid\n";
3550 }; 3738 };
3551 3739
3740 warn "emergency_perl_save: starting sync()\n";
3741 IO::AIO::aio_sync sub {
3742 warn "emergency_perl_save: finished sync()\n";
3743 };
3744
3552 warn "leave emergency perl save\n"; 3745 warn "emergency_perl_save: leave\n";
3553} 3746}
3554 3747
3555sub post_cleanup { 3748sub post_cleanup {
3556 my ($make_core) = @_; 3749 my ($make_core) = @_;
3557 3750
3558 warn Carp::longmess "post_cleanup backtrace" 3751 warn Carp::longmess "post_cleanup backtrace"
3559 if $make_core; 3752 if $make_core;
3753
3754 my $fh = pidfile;
3755 unlink $PIDFILE if <$fh> == $$;
3756}
3757
3758# a safer delete_package, copied from Symbol
3759sub clear_package($) {
3760 my $pkg = shift;
3761
3762 # expand to full symbol table name if needed
3763 unless ($pkg =~ /^main::.*::$/) {
3764 $pkg = "main$pkg" if $pkg =~ /^::/;
3765 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3766 $pkg .= '::' unless $pkg =~ /::$/;
3767 }
3768
3769 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3770 my $stem_symtab = *{$stem}{HASH};
3771
3772 defined $stem_symtab and exists $stem_symtab->{$leaf}
3773 or return;
3774
3775 # clear all symbols
3776 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3777 for my $name (keys %$leaf_symtab) {
3778 _gv_clear *{"$pkg$name"};
3779# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3780 }
3781 warn "cleared package $pkg\n";#d#
3560} 3782}
3561 3783
3562sub do_reload_perl() { 3784sub do_reload_perl() {
3563 # can/must only be called in main 3785 # can/must only be called in main
3564 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3565 warn "can only reload from main coroutine"; 3787 warn "can only reload from main coroutine";
3566 return; 3788 return;
3567 } 3789 }
3568 3790
3791 return if $RELOAD++;
3792
3793 my $t1 = AE::time;
3794
3795 while ($RELOAD) {
3569 warn "reloading..."; 3796 warn "reloading...";
3570 3797
3571 warn "entering sync_job"; 3798 warn "entering sync_job";
3572 3799
3573 cf::sync_job { 3800 cf::sync_job {
3574 cf::write_runtime_sync; # external watchdog should not bark 3801 cf::write_runtime_sync; # external watchdog should not bark
3575 cf::emergency_save; 3802 cf::emergency_save;
3576 cf::write_runtime_sync; # external watchdog should not bark 3803 cf::write_runtime_sync; # external watchdog should not bark
3577 3804
3578 warn "syncing database to disk"; 3805 warn "syncing database to disk";
3579 BDB::db_env_txn_checkpoint $DB_ENV; 3806 BDB::db_env_txn_checkpoint $DB_ENV;
3580 3807
3581 # if anything goes wrong in here, we should simply crash as we already saved 3808 # if anything goes wrong in here, we should simply crash as we already saved
3582 3809
3583 warn "flushing outstanding aio requests"; 3810 warn "flushing outstanding aio requests";
3584 for (;;) {
3585 BDB::flush;
3586 IO::AIO::flush;
3587 Coro::cede_notself;
3588 last unless IO::AIO::nreqs || BDB::nreqs; 3811 while (IO::AIO::nreqs || BDB::nreqs) {
3589 warn "iterate..."; 3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3590 }
3591
3592 ++$RELOAD;
3593
3594 warn "cancelling all extension coros";
3595 $_->cancel for values %EXT_CORO;
3596 %EXT_CORO = ();
3597
3598 warn "removing commands";
3599 %COMMAND = ();
3600
3601 warn "removing ext/exti commands";
3602 %EXTCMD = ();
3603 %EXTICMD = ();
3604
3605 warn "unloading/nuking all extensions";
3606 for my $pkg (@EXTS) {
3607 warn "... unloading $pkg";
3608
3609 if (my $cb = $pkg->can ("unload")) {
3610 eval {
3611 $cb->($pkg);
3612 1
3613 } or warn "$pkg unloaded, but with errors: $@";
3614 } 3813 }
3615 3814
3616 warn "... nuking $pkg"; 3815 warn "cancelling all extension coros";
3617 Symbol::delete_package $pkg; 3816 $_->cancel for values %EXT_CORO;
3618 } 3817 %EXT_CORO = ();
3619 3818
3620 warn "unloading all perl modules loaded from $LIBDIR"; 3819 warn "removing commands";
3621 while (my ($k, $v) = each %INC) { 3820 %COMMAND = ();
3622 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623 3821
3822 warn "removing ext/exti commands";
3823 %EXTCMD = ();
3824 %EXTICMD = ();
3825
3826 warn "unloading/nuking all extensions";
3827 for my $pkg (@EXTS) {
3624 warn "... unloading $k"; 3828 warn "... unloading $pkg";
3625 delete $INC{$k};
3626 3829
3627 $k =~ s/\.pm$//;
3628 $k =~ s/\//::/g;
3629
3630 if (my $cb = $k->can ("unload_module")) { 3830 if (my $cb = $pkg->can ("unload")) {
3831 eval {
3631 $cb->(); 3832 $cb->($pkg);
3833 1
3834 } or warn "$pkg unloaded, but with errors: $@";
3835 }
3836
3837 warn "... clearing $pkg";
3838 clear_package $pkg;
3632 } 3839 }
3633 3840
3634 Symbol::delete_package $k; 3841 warn "unloading all perl modules loaded from $LIBDIR";
3842 while (my ($k, $v) = each %INC) {
3843 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3844
3845 warn "... unloading $k";
3846 delete $INC{$k};
3847
3848 $k =~ s/\.pm$//;
3849 $k =~ s/\//::/g;
3850
3851 if (my $cb = $k->can ("unload_module")) {
3852 $cb->();
3853 }
3854
3855 clear_package $k;
3635 } 3856 }
3636 3857
3637 warn "getting rid of safe::, as good as possible"; 3858 warn "getting rid of safe::, as good as possible";
3638 Symbol::delete_package "safe::$_" 3859 clear_package "safe::$_"
3639 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3860 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3640 3861
3641 warn "unloading cf.pm \"a bit\""; 3862 warn "unloading cf.pm \"a bit\"";
3642 delete $INC{"cf.pm"}; 3863 delete $INC{"cf.pm"};
3643 delete $INC{"cf/pod.pm"}; 3864 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3644 3865
3645 # don't, removes xs symbols, too, 3866 # don't, removes xs symbols, too,
3646 # and global variables created in xs 3867 # and global variables created in xs
3647 #Symbol::delete_package __PACKAGE__; 3868 #clear_package __PACKAGE__;
3648 3869
3649 warn "unload completed, starting to reload now"; 3870 warn "unload completed, starting to reload now";
3650 3871
3651 warn "reloading cf.pm"; 3872 warn "reloading cf.pm";
3652 require cf; 3873 require cf;
3653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3874 cf::_connect_to_perl_1;
3654 3875
3655 warn "loading config and database again"; 3876 warn "loading config and database again";
3656 cf::reload_config; 3877 cf::reload_config;
3657 3878
3658 warn "loading extensions"; 3879 warn "loading extensions";
3659 cf::load_extensions; 3880 cf::load_extensions;
3660 3881
3882 if ($REATTACH_ON_RELOAD) {
3661 warn "reattaching attachments to objects/players"; 3883 warn "reattaching attachments to objects/players";
3662 _global_reattach; # objects, sockets 3884 _global_reattach; # objects, sockets
3663 warn "reattaching attachments to maps"; 3885 warn "reattaching attachments to maps";
3664 reattach $_ for values %MAP; 3886 reattach $_ for values %MAP;
3665 warn "reattaching attachments to players"; 3887 warn "reattaching attachments to players";
3666 reattach $_ for values %PLAYER; 3888 reattach $_ for values %PLAYER;
3889 }
3667 3890
3891 warn "running post_init jobs";
3892 (pop @POST_INIT)->(1) while @POST_INIT;
3893
3668 warn "leaving sync_job"; 3894 warn "leaving sync_job";
3669 3895
3670 1 3896 1
3671 } or do { 3897 } or do {
3672 warn $@; 3898 warn $@;
3673 cf::cleanup "error while reloading, exiting."; 3899 cf::cleanup "error while reloading, exiting.";
3674 }; 3900 };
3675 3901
3676 warn "reloaded"; 3902 warn "reloaded";
3903 --$RELOAD;
3904 }
3905
3906 $t1 = AE::time - $t1;
3907 warn "reload completed in ${t1}s\n";
3677}; 3908};
3678 3909
3679our $RELOAD_WATCHER; # used only during reload 3910our $RELOAD_WATCHER; # used only during reload
3680 3911
3681sub reload_perl() { 3912sub reload_perl() {
3682 # doing reload synchronously and two reloads happen back-to-back, 3913 # doing reload synchronously and two reloads happen back-to-back,
3683 # coro crashes during coro_state_free->destroy here. 3914 # coro crashes during coro_state_free->destroy here.
3684 3915
3916 $RELOAD_WATCHER ||= cf::async {
3917 Coro::AIO::aio_wait cache_extensions;
3918
3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3919 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3686 do_reload_perl; 3920 do_reload_perl;
3687 undef $RELOAD_WATCHER; 3921 undef $RELOAD_WATCHER;
3922 };
3688 }; 3923 };
3689} 3924}
3690 3925
3691register_command "reload" => sub { 3926register_command "reload" => sub {
3692 my ($who, $arg) = @_; 3927 my ($who, $arg) = @_;
3706 3941
3707our @WAIT_FOR_TICK; 3942our @WAIT_FOR_TICK;
3708our @WAIT_FOR_TICK_BEGIN; 3943our @WAIT_FOR_TICK_BEGIN;
3709 3944
3710sub wait_for_tick { 3945sub wait_for_tick {
3711 return if tick_inhibit || $Coro::current == $Coro::main; 3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3712 3947
3713 my $signal = new Coro::Signal; 3948 my $signal = new Coro::Signal;
3714 push @WAIT_FOR_TICK, $signal; 3949 push @WAIT_FOR_TICK, $signal;
3715 $signal->wait; 3950 $signal->wait;
3716} 3951}
3717 3952
3718sub wait_for_tick_begin { 3953sub wait_for_tick_begin {
3719 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3720 3955
3721 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3722 push @WAIT_FOR_TICK_BEGIN, $signal; 3957 push @WAIT_FOR_TICK_BEGIN, $signal;
3723 $signal->wait; 3958 $signal->wait;
3724} 3959}
3729 unless ++$bug_warning > 10; 3964 unless ++$bug_warning > 10;
3730 return; 3965 return;
3731 } 3966 }
3732 3967
3733 cf::server_tick; # one server iteration 3968 cf::server_tick; # one server iteration
3969
3970 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3734 3971
3735 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3972 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3737 Coro::async_pool { 3974 Coro::async_pool {
3738 $Coro::current->{desc} = "runtime saver"; 3975 $Coro::current->{desc} = "runtime saver";
3761} 3998}
3762 3999
3763{ 4000{
3764 # configure BDB 4001 # configure BDB
3765 4002
3766 BDB::min_parallel 8; 4003 BDB::min_parallel 16;
3767 BDB::max_poll_reqs $TICK * 0.1; 4004 BDB::max_poll_reqs $TICK * 0.1;
3768 $Coro::BDB::WATCHER->priority (1); 4005 $AnyEvent::BDB::WATCHER->priority (1);
3769 4006
3770 unless ($DB_ENV) { 4007 unless ($DB_ENV) {
3771 $DB_ENV = BDB::db_env_create; 4008 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4009 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3773 | BDB::LOG_AUTOREMOVE, 1); 4010 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4011 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4012 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4013 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776 4014
3777 cf::sync_job { 4015 cf::sync_job {
3778 eval { 4016 eval {
3804{ 4042{
3805 # configure IO::AIO 4043 # configure IO::AIO
3806 4044
3807 IO::AIO::min_parallel 8; 4045 IO::AIO::min_parallel 8;
3808 IO::AIO::max_poll_time $TICK * 0.1; 4046 IO::AIO::max_poll_time $TICK * 0.1;
3809 $Coro::AIO::WATCHER->priority (1); 4047 undef $AnyEvent::AIO::WATCHER;
3810} 4048}
3811 4049
3812my $_log_backtrace; 4050my $_log_backtrace;
3813 4051
3814sub _log_backtrace { 4052sub _log_backtrace {
3817 $msg =~ s/\n//; 4055 $msg =~ s/\n//;
3818 4056
3819 # limit the # of concurrent backtraces 4057 # limit the # of concurrent backtraces
3820 if ($_log_backtrace < 2) { 4058 if ($_log_backtrace < 2) {
3821 ++$_log_backtrace; 4059 ++$_log_backtrace;
4060 my $perl_bt = Carp::longmess $msg;
3822 async { 4061 async {
3823 $Coro::current->{desc} = "abt $msg"; 4062 $Coro::current->{desc} = "abt $msg";
3824 4063
3825 my @bt = fork_call { 4064 my @bt = fork_call {
3826 @addr = map { sprintf "%x", $_ } @addr; 4065 @addr = map { sprintf "%x", $_ } @addr;
3837 } 4076 }
3838 4077
3839 @funcs 4078 @funcs
3840 }; 4079 };
3841 4080
3842 LOG llevInfo, "[ABT] $msg\n"; 4081 LOG llevInfo, "[ABT] $perl_bt\n";
4082 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843 LOG llevInfo, "[ABT] $_\n" for @bt; 4083 LOG llevInfo, "[ABT] $_\n" for @bt;
3844 --$_log_backtrace; 4084 --$_log_backtrace;
3845 }; 4085 };
3846 } else { 4086 } else {
3847 LOG llevInfo, "[ABT] $msg\n"; 4087 LOG llevInfo, "[ABT] $msg\n";
3848 LOG llevInfo, "[ABT] [suppressed]\n"; 4088 LOG llevInfo, "[ABT] [suppressed]\n";
3849 } 4089 }
3850} 4090}
3851 4091
3852# load additional modules 4092# load additional modules
3853use cf::pod; 4093require "cf/$_.pm" for @EXTRA_MODULES;
4094cf::_connect_to_perl_2;
3854 4095
3855END { cf::emergency_save } 4096END { cf::emergency_save }
3856 4097
38571 40981
3858 4099

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines