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.395 by root, Sat Nov 10 22:41:59 2007 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5; 58use Digest::MD5;
30use Fcntl; 59use Fcntl;
31use YAML::Syck (); 60use YAML::XS ();
32use IO::AIO 2.51 (); 61use IO::AIO ();
33use Time::HiRes; 62use Time::HiRes;
34use Compress::LZF; 63use Compress::LZF;
35use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
36 67
37# configure various modules to our taste 68# configure various modules to our taste
38# 69#
39$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 78
43$Event::Eval = 1; # no idea why this is required, but it is 79# strictly for debugging
44 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 81
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 83
52our %COMMAND = (); 84our %COMMAND = ();
53our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
56our %EXTCMD = (); 88our %EXTCMD = ();
57our %EXTICMD = (); 89our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
60 92
61our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
63 97
64our $CONFDIR = confdir; 98our $CONFDIR = confdir;
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
112our %RESOURCE;
75 113
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 116our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
83 118
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 122our $DB_ENV;
89 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
90our %CFG; 126our %CFG;
91 127
92our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 129our $RUNTIME;
130our $NOW;
94 131
95our (%PLAYER, %PLAYER_LOADING); # all users 132our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 133our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 134our $LINK_MAP; # the special {link} map, which is always available
98 135
99# used to convert map paths into valid unix filenames by replacing / by ∕ 136# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 138
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
105 148
106binmode STDOUT; 149binmode STDOUT;
107binmode STDERR; 150binmode STDERR;
108 151
109# read virtual server time, if available 152# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
114} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
115 160
116mkdir $_ 161mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 163
119our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
120 165
121sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 178
123############################################################################# 179#############################################################################
124 180
125=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
126 182
173returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 231
176=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
177 233
178This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 236that call.
181 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
182=back 244=back
183 245
184=cut 246=cut
185 247
186BEGIN { 248$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 249 my $msg = join "", @_;
189 250
190 $msg .= "\n" 251 $msg .= "\n"
191 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
192 253
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 255
195 LOG llevError, $msg; 256 LOG llevError, $msg;
196 }; 257};
197} 258
259$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
263
264 if ($Coro::current == $Coro::main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d#
267 }#d#
268
269 # kill coroutine otherwise
270 Coro::terminate
271};
198 272
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 283for my $pkg (qw(
210 cf::global cf::attachable 284 cf::global cf::attachable
211 cf::object cf::object::player 285 cf::object cf::object::player
212 cf::client cf::player 286 cf::client cf::player
213 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
214 cf::map cf::party cf::region 289 cf::party cf::region
215)) { 290)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 292}
219 293
220$Event::DIED = sub { 294$EV::DIED = sub {
221 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
222}; 296};
223 297
224############################################################################# 298#############################################################################
225 299
226=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 323 $d
250 } || "[unable to dump $_[0]: '$@']"; 324 } || "[unable to dump $_[0]: '$@']";
251} 325}
252 326
253=item $ref = cf::from_json $json 327=item $ref = cf::decode_json $json
254 328
255Converts a JSON string into the corresponding perl data structure. 329Converts a JSON string into the corresponding perl data structure.
256 330
257=item $json = cf::to_json $ref 331=item $json = cf::encode_json $ref
258 332
259Converts a perl data structure into its JSON representation. 333Converts a perl data structure into its JSON representation.
260 334
261=cut 335=cut
262 336
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 338
265sub to_json ($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
267 355
268=item cf::lock_wait $string 356=item cf::lock_wait $string
269 357
270Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
271 359
272=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
273 361
274Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
277returned. 365returned.
278 366
279Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 368deadlocked coro.
286 374
287Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
288 376
289=cut 377=cut
290 378
291our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 380
294sub lock_wait($) { 381sub lock_wait($) {
295 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 383}
308 384
309sub lock_acquire($) { 385sub lock_acquire($) {
310 my ($key) = @_; 386 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 387}
324 388
325sub lock_active($) { 389sub lock_active($) {
326 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 391}
330 392
331sub freeze_mainloop { 393sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
333 395
334 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 397}
336 }; 398
337 $TICK_WATCHER->stop; 399=item cf::periodic $interval, $cb
338 $guard 400
401Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer.
403
404=cut
405
406sub periodic($$) {
407 my ($interval, $cb) = @_;
408
409 my $start = rand List::Util::min 180, $interval;
410
411 EV::periodic $start, $interval, 0, $cb
339} 412}
340 413
341=item cf::get_slot $time[, $priority[, $name]] 414=item cf::get_slot $time[, $priority[, $name]]
342 415
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 416Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 456 }
384 } 457 }
385}; 458};
386 459
387sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
388 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
389 464
390 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
392 467
422 497
423sub sync_job(&) { 498sub sync_job(&) {
424 my ($job) = @_; 499 my ($job) = @_;
425 500
426 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 502 my $time = EV::time;
428 503
429 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
431 506
432 LOG llevError, Carp::longmess "sync job";#d# 507 LOG llevError, Carp::longmess "sync job";#d#
433 508
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
437 510
438 my $busy = 1; 511 my $busy = 1;
439 my @res; 512 my @res;
440 513
447 520
448 while ($busy) { 521 while ($busy) {
449 if (Coro::nready) { 522 if (Coro::nready) {
450 Coro::cede_notself; 523 Coro::cede_notself;
451 } else { 524 } else {
452 Event::one_event; 525 EV::loop EV::LOOP_ONESHOT;
453 } 526 }
454 } 527 }
455 528
456 $time = Event::time - $time; 529 my $time = EV::time - $time;
457 530
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
462 532
463 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
464 } else { 534 } else {
465 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
466 536
491=item fork_call { }, $args 561=item fork_call { }, $args
492 562
493Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
497 567
498=cut 568=cut
499 569
500sub fork_call(&@) { 570sub fork_call(&@) {
501 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
508 reset_signals; 578 reset_signals;
509 &$cb 579 &$cb
510 }, @args; 580 }, @args;
511 581
512 wantarray ? @res : $res[-1] 582 wantarray ? @res : $res[-1]
583}
584
585=item $coin = coin_from_name $name
586
587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
513} 610}
514 611
515=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
516 613
517Returns a single value from the environment database. 614Returns a single value from the environment database.
656 753
657############################################################################# 754#############################################################################
658 755
659=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
660 757
661Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
664 761
665In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
716=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
717 814
718Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
720 817
721Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
723 820
724These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
725 822
726=over 4 823=over 4
954 } 1051 }
955 1052
956 0 1053 0
957} 1054}
958 1055
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1057
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1059
963Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
964 1061
1017 1114
1018sub reattach { 1115sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1117 my ($obj) = @_;
1021 1118
1119 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1121
1024 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1025 1123
1026 @$registry = (); 1124 @$registry = ();
1027 1125
1042cf::attachable->attach ( 1140cf::attachable->attach (
1043 prio => -1000000, 1141 prio => -1000000,
1044 on_instantiate => sub { 1142 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
1046 1144
1047 $data = from_json $data; 1145 $data = decode_json $data;
1048 1146
1049 for (@$data) { 1147 for (@$data) {
1050 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
1051 1149
1052 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1076 1174
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1081 close $fh; 1182 aio_close $fh;
1082 1183
1083 if (@$objs) { 1184 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1089 close $fh; 1193 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1195 }
1092 } else { 1196 } else {
1093 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1094 } 1198 }
1095 1199
1096 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1204 } else {
1098 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1099 } 1206 }
1100 } else { 1207 } else {
1101 aio_unlink $filename; 1208 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1103 } 1210 }
1194 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1195 1302
1196 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1197} 1304}
1198 1305
1306use File::Glob ();
1307
1199cf::player->attach ( 1308cf::player->attach (
1200 on_command => sub { 1309 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1202 1311
1203 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1235 1344
1236 cf::override; 1345 cf::override;
1237 }, 1346 },
1238); 1347);
1239 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1240sub load_extensions { 1362sub load_extensions {
1241 cf::sync_job { 1363 cf::sync_job {
1242 my %todo; 1364 my %todo;
1243 1365
1244 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1263 1385
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1388
1267 $ext{source} = 1389 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1270 . $source 1392 . $source
1271 . "\n};\n1"; 1393 . "\n};\n1";
1272 1394
1273 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1291 1413
1292 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1415 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1417 }
1297 1418
1298 warn $msg; 1419 warn $msg;
1299 } 1420 }
1300 1421
1314 1435
1315=back 1436=back
1316 1437
1317=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1318 1439
1319Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1320 1441
1321=cut 1442=cut
1322 1443
1323package cf::player; 1444package cf::player;
1324 1445
1367 1488
1368sub exists($) { 1489sub exists($) {
1369 my ($login) = @_; 1490 my ($login) = @_;
1370 1491
1371 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1373} 1494}
1374 1495
1375sub find($) { 1496sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1498 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1511 or return;
1391 1512
1392 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1393 or return; 1514 or return;
1515
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1397 } 1519 }
1398 } 1520 }
1408 1530
1409 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1410 1532
1411 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1413 1537
1414 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1539 cf::cede_to_tick;
1416} 1540}
1417 1541
1449 my ($pl) = @_; 1573 my ($pl) = @_;
1450 1574
1451 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1452 1576
1453 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1579
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1460 1586
1461 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1627
1502 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1503 my $path = path $login; 1629 my $path = path $login;
1504 1630
1505 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1637 }
1511 1638
1542 } 1669 }
1543 1670
1544 \@paths 1671 \@paths
1545} 1672}
1546 1673
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1675
1549Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1677
1640=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1641 1679
1642Sends an ext reply to the player. 1680Sends an ext reply to the player.
1643 1681
1710our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1712 1750
1713sub generate_random_map { 1751sub generate_random_map {
1714 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1715 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1757 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1841 1882
1842# the temporary/swap location 1883# the temporary/swap location
1843sub save_path { 1884sub save_path {
1844 my ($self) = @_; 1885 my ($self) = @_;
1845 1886
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1848} 1889}
1849 1890
1850# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1851sub uniq_path { 1892sub uniq_path {
1852 my ($self) = @_; 1893 my ($self) = @_;
1853 1894
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 1897}
1866 1898
1867sub decay_objects { 1899sub decay_objects {
1868 my ($self) = @_; 1900 my ($self) = @_;
1869 1901
1953sub find { 1985sub find {
1954 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1955 1987
1956 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1957 1989
1958 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1960 1992
1961 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1966 or return; 1995 or return;
1967 1996
1968 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1969 1998
1971 or return; 2000 or return;
1972 2001
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
1976 undef $guard1; 2006 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2007 $map->reset;
1979 return find $path; 2008 return find $path;
1980 } 2009 }
1981 2010
1982 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2039 $f->skip_block;
2011 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2012 or return; 2041 or return;
2013 2042
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2015 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2016 2045
2017 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2047 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2037 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2067 $self->decay_objects;
2039 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2040 $self->update_buttons; 2069 $self->update_buttons;
2041 cf::cede_to_tick; 2070 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2071 $self->activate;
2045 } 2072 }
2046 2073
2047 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2049 2076
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2078 }
2052 2079
2053 $self->post_load; 2080 $self->post_load;
2054} 2081}
2055 2082
2113 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2114 2141
2115 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2116 2143
2117 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2146 }
2120 2147
2121 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2122 2149
2123 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2160 cf::async { 2187 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2163 }; 2190 };
2164 2191
2192 cf::get_slot 0.02;
2193
2165 if ($uniq) { 2194 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2197 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 $self->save; 2206 $self->save;
2178 2207
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2209
2181 return if $self->players; 2210 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2184 2213
2185 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2186 2215
2187 $self->deactivate; 2216 $self->deactivate;
2212 2241
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2243
2215 return if $self->players; 2244 return if $self->players;
2216 2245
2217 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2218 2247
2219 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2220 2249
2221 # need to save uniques path 2250 # need to save uniques path
2222 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2305 2334
2306sub unique_maps() { 2335sub unique_maps() {
2307 [ 2336 [
2308 map { 2337 map {
2309 utf8::decode $_; 2338 utf8::decode $_;
2310 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2311 ? normalise $_ 2342 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2344 ]
2315} 2345}
2316 2346
2317package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2318 2378
2319=back 2379=back
2320 2380
2321=head3 cf::object 2381=head3 cf::object
2322 2382
2326 2386
2327=over 4 2387=over 4
2328 2388
2329=item $ob->inv_recursive 2389=item $ob->inv_recursive
2330 2390
2331Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2332 2393
2333=cut 2394=cut
2334 2395
2335sub inv_recursive_; 2396sub inv_recursive_;
2336sub inv_recursive_ { 2397sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2342} 2403}
2343 2404
2344=item $ref = $ob->ref 2405=item $ref = $ob->ref
2345 2406
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2407Creates and returns a persistent reference to an object that can be stored as a string.
2347 2408
2348=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2349 2410
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2412even if the object actually exists. May block.
2383can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2445dialogue with the given NPC character.
2385 2446
2386=cut 2447=cut
2387 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2388# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2464# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2480
2406 } else { 2481 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2484 }
2410 } 2485 }
2411} 2486}
2412 2487
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2438 2513
2439=item $player_object->enter_link 2514=item $player_object->enter_link
2440 2515
2441Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2442 2517
2443The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2444I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2445 2522
2446Will never block. 2523Will never block.
2447 2524
2448=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2449 2526
2501 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2502 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2503 2580
2504 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2505 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2506 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2507 2584
2508 $map->load; 2585 $map->load;
2509 $map->load_neighbours; 2586 $map->load_neighbours;
2510 2587
2511 return unless $self->contr->active; 2588 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2589
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2516} 2595}
2517 2596
2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2519 2598
2520Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2521her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2522that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2523the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2525 2607
2526=cut 2608=cut
2527 2609
2528our $GOTOGEN; 2610our $GOTOGEN;
2529 2611
2608} 2690}
2609 2691
2610sub prepare_random_map { 2692sub prepare_random_map {
2611 my ($exit) = @_; 2693 my ($exit) = @_;
2612 2694
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2697 # that depends on the exit object
2618 2698
2619 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2701 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2626 } 2708 }
2627 2709
2628 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2629 2711
2630 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2633 2715
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2718 undef $fh;
2637 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2638 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2641 } 2727 }
2642} 2728}
2643 2729
2644sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2646 2732
2647 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2648 2734
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2735 $self->enter_link;
2661 2736
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2737 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2668 2739
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2671 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2672 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2673 1; 2761 1
2674 }) { 2762 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2767
2680 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2710 2798
2711=cut 2799=cut
2712 2800
2713# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2714our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2715 "c/identify" => { 2809 "c/identify" => {
2716 id => "infobox", 2810 id => "infobox",
2717 title => "Identify", 2811 title => "Identify",
2718 reply => undef, 2812 reply => undef,
2719 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2721 "c/examine" => { 2815 "c/examine" => {
2722 id => "infobox", 2816 id => "infobox",
2723 title => "Examine", 2817 title => "Examine",
2724 reply => undef, 2818 reply => undef,
2725 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2726 }, 2826 },
2727 "c/book" => { 2827 "c/book" => {
2728 id => "infobox", 2828 id => "infobox",
2729 title => "Book", 2829 title => "Book",
2730 reply => undef, 2830 reply => undef,
2746 id => "infobox", 2846 id => "infobox",
2747 title => "Body Parts", 2847 title => "Body Parts",
2748 reply => undef, 2848 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2750 }, 2850 },
2851 "c/statistics" => {
2852 id => "infobox",
2853 title => "Statistics",
2854 reply => undef,
2855 tooltip => "Shows your primary statistics",
2856 },
2857 "c/skills" => {
2858 id => "infobox",
2859 title => "Skills",
2860 reply => undef,
2861 tooltip => "Shows your experience per skill and item power",
2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2869 "c/resistances" => {
2870 id => "infobox",
2871 title => "Resistances",
2872 reply => undef,
2873 tooltip => "Shows your resistances",
2874 },
2875 "c/pets" => {
2876 id => "infobox",
2877 title => "Pets",
2878 reply => undef,
2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2886 },
2751 "c/uptime" => { 2887 "c/uptime" => {
2752 id => "infobox", 2888 id => "infobox",
2753 title => "Uptime", 2889 title => "Uptime",
2754 reply => undef, 2890 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2758 id => "infobox", 2894 id => "infobox",
2759 title => "Map Info", 2895 title => "Map Info",
2760 reply => undef, 2896 reply => undef,
2761 tooltip => "Information related to the maps", 2897 tooltip => "Information related to the maps",
2762 }, 2898 },
2899 "c/party" => {
2900 id => "party",
2901 title => "Party",
2902 reply => "gsay ",
2903 tooltip => "Messages and chat related to your party",
2904 },
2905 "c/death" => {
2906 id => "death",
2907 title => "Death",
2908 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death",
2910 },
2911 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL,
2763); 2913);
2764 2914
2765sub cf::client::send_msg { 2915sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2917
2768 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2769 2920
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 2922
2772 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2775 2926
2776 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2780 2929
2781 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 2935 }
2788 2936
2789 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2790 } 2938 }
2791 2939
2792 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2793 2941
2794 if ($self->can_msg) {
2795 # default colour, mask it out 2942 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2798 2945
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 2949 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 2950
2813 $color &= cf::NDI_COLOR_MASK; 2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2814 2954
2815 utf8::encode $msg; 2955 # split very large packets
2816 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2817 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2818 # COMMAND/INFO 2958 $pkt = "frag";
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 } 2959 }
2960
2961 $self->send_packet ($pkt);
2826} 2962}
2827 2963
2828=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2829 2965
2830Sends an ext event to the client. 2966Sends an ext event to the client.
3004 3140
3005The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3006 3142
3007 cf::object 3143 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3144 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3145 insert remove name archname title slaying race decrease split
3146 value
3010 3147
3011 cf::object::player 3148 cf::object::player
3012 player 3149 player
3013 3150
3014 cf::player 3151 cf::player
3019 3156
3020=cut 3157=cut
3021 3158
3022for ( 3159for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3160 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3029) { 3166) {
3030 no strict 'refs'; 3167 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3049 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3050 3187
3051 my $qcode = $code; 3188 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3054 3193
3055 local $_; 3194 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3057 3196
3058 my $eval = 3197 my $eval =
3135 { 3274 {
3136 my $faces = $facedata->{faceinfo}; 3275 my $faces = $facedata->{faceinfo};
3137 3276
3138 while (my ($face, $info) = each %$faces) { 3277 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3278 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279
3140 cf::face::set_visibility $idx, $info->{visibility}; 3280 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3281 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3284
3145 cf::cede_to_tick; 3285 cf::cede_to_tick;
3146 } 3286 }
3147 3287
3148 while (my ($face, $info) = each %$faces) { 3288 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3289 next unless $info->{smooth};
3290
3150 my $idx = cf::face::find $face 3291 my $idx = cf::face::find $face
3151 or next; 3292 or next;
3293
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3294 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3295 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3296 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3297 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3298 warn "smooth face '$info->{smooth}' not found for face '$face'";
3174 { 3316 {
3175 # TODO: for gcfclient pleasure, we should give resources 3317 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3318 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3319 my $res = $facedata->{resource};
3178 3320
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3321 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3323 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3324 my $data;
3184 3325
3185 if ($info->{type} & 1) { 3326 if ($info->{type} & 1) {
3186 # prepend meta info 3327 # prepend meta info
3187 3328
3188 my $meta = $enc->encode ({ 3329 my $meta = $enc->encode ({
3189 name => $name, 3330 name => $name,
3190 %{ $info->{meta} || {} }, 3331 %{ $info->{meta} || {} },
3191 }); 3332 });
3192 3333
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type};
3194 } else { 3341 } else {
3195 $data = $info->{data}; 3342 $RESOURCE{$name} = $info;
3196 } 3343 }
3197 3344
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3345 cf::cede_to_tick;
3202 } 3346 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3347 }
3348
3349 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3350
3223 1 3351 1
3224} 3352}
3353
3354cf::global->attach (on_resource_update => sub {
3355 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3356 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3357
3358 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3359 my $sound = $soundconf->{compat}[$_]
3360 or next;
3361
3362 my $face = cf::face::find "sound/$sound->[1]";
3363 cf::sound::set $sound->[0] => $face;
3364 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3365 }
3366
3367 while (my ($k, $v) = each %{$soundconf->{event}}) {
3368 my $face = cf::face::find "sound/$v";
3369 cf::sound::set $k => $face;
3370 }
3371 }
3372});
3225 3373
3226register_exticmd fx_want => sub { 3374register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3375 my ($ns, $want) = @_;
3228 3376
3229 while (my ($k, $v) = each %$want) { 3377 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3378 $ns->fx_want ($k, $v);
3231 } 3379 }
3232}; 3380};
3381
3382sub load_resource_file($) {
3383 my $guard = lock_acquire "load_resource_file";
3384
3385 my $status = load_resource_file_ $_[0];
3386 get_slot 0.1, 100;
3387 cf::arch::commit_load;
3388
3389 $status
3390}
3233 3391
3234sub reload_regions { 3392sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3393 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3394 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3395 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3409}
3252 3410
3253sub reload_archetypes { 3411sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3412 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3413 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3414}
3262 3415
3263sub reload_treasures { 3416sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3417 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3418 or die "unable to load treasurelists\n";
3266} 3419}
3267 3420
3268sub reload_resources { 3421sub reload_resources {
3269 warn "reloading resource files...\n"; 3422 warn "reloading resource files...\n";
3270 3423
3424 reload_facedata;
3425 reload_archetypes;
3271 reload_regions; 3426 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3427 reload_treasures;
3276 3428
3277 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3278} 3430}
3279 3431
3280sub init {
3281 reload_resources;
3282}
3283
3284sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3436 or return;
3287 3437
3288 local $/; 3438 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3290 3440
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3442
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3299 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3300 }; 3450 };
3301 warn $@ if $@; 3451 warn $@ if $@;
3302 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3455}
3456
3457sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!";
3460 flock $fh, &Fcntl::LOCK_EX
3461 or die "$PIDFILE: flock: $!";
3462 $fh
3463}
3464
3465# make sure only one server instance is running at any one time
3466sub atomic {
3467 my $fh = pidfile;
3468
3469 my $pid = <$fh>;
3470 kill 9, $pid if $pid > 0;
3471
3472 seek $fh, 0, 0;
3473 print $fh $$;
3474}
3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3303} 3483}
3304 3484
3305sub main { 3485sub main {
3486 cf::init_globals; # initialise logging
3487
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499
3306 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3503 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3505 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3313 }; 3507 };
3314 3508
3509 evthread_start IO::AIO::poll_fileno;
3510
3511 cf::sync_job {
3512 reload_resources;
3315 reload_config; 3513 reload_config;
3316 db_init; 3514 db_init;
3515
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid;
3519 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills;
3522
3523 cf::init_beforeplay;
3524
3525 atomic;
3526
3317 load_extensions; 3527 load_extensions;
3318 3528
3319 $TICK_WATCHER->start; 3529 utime time, time, $RUNTIMEFILE;
3320 Event::loop; 3530
3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534
3535 (pop @POST_INIT)->(0) while @POST_INIT;
3536 };
3537
3538 main_loop;
3321} 3539}
3322 3540
3323############################################################################# 3541#############################################################################
3324# initialisation and cleanup 3542# initialisation and cleanup
3325 3543
3326# install some emergency cleanup handlers 3544# install some emergency cleanup handlers
3327BEGIN { 3545BEGIN {
3546 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3547 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3548 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3549 cf::cleanup "SIG$signal";
3336 },
3337 ); 3550 };
3338 } 3551 }
3339} 3552}
3340 3553
3341sub write_runtime { 3554sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3346 3557
3347 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3559
3349 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3350 3561
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3352 or return; 3563 or return;
3353 3564
3354 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3367 3578
3368 close $fh 3579 close $fh
3369 or return; 3580 or return;
3370 3581
3371 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3583 and return;
3373 3584
3374 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3375 3586
3376 1 3587 1
3588}
3589
3590our $uuid_lock;
3591our $uuid_skip;
3592
3593sub write_uuid_sync($) {
3594 $uuid_skip ||= $_[0];
3595
3596 return if $uuid_lock;
3597 local $uuid_lock = 1;
3598
3599 my $uuid = "$LOCALDIR/uuid";
3600
3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3602 or return;
3603
3604 my $value = uuid_seq uuid_cur;
3605
3606 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n";
3608 return;
3609 }
3610
3611 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0;
3613
3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3615 and return;
3616
3617 # always fsync - this file is important
3618 aio_fsync $fh
3619 and return;
3620
3621 close $fh
3622 or return;
3623
3624 aio_rename "$uuid~", $uuid
3625 and return;
3626
3627 warn "uuid file written ($value).\n";
3628
3629 1
3630
3631}
3632
3633sub write_uuid($$) {
3634 my ($skip, $sync) = @_;
3635
3636 $sync ? write_uuid_sync $skip
3637 : async { write_uuid_sync $skip };
3377} 3638}
3378 3639
3379sub emergency_save() { 3640sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3381 3642
3382 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3383 3644
3384 cf::sync_job { 3645 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650
3385 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3657 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3659 $pl->save;
3394 } 3660 }
3395 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3396 3662
3397 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3398 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3666 $map->valid or next;
3401 $map->save; 3667 $map->save;
3402 } 3668 }
3403 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3404 3670
3405 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3674
3675 warn "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n";
3408 }; 3678 };
3409 3679
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3410 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3411} 3686}
3412 3687
3413sub post_cleanup { 3688sub post_cleanup {
3414 my ($make_core) = @_; 3689 my ($make_core) = @_;
3415 3690
3416 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3692 if $make_core;
3693
3694 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$;
3696}
3697
3698# a safer delete_package, copied from Symbol
3699sub clear_package($) {
3700 my $pkg = shift;
3701
3702 # expand to full symbol table name if needed
3703 unless ($pkg =~ /^main::.*::$/) {
3704 $pkg = "main$pkg" if $pkg =~ /^::/;
3705 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3706 $pkg .= '::' unless $pkg =~ /::$/;
3707 }
3708
3709 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3710 my $stem_symtab = *{$stem}{HASH};
3711
3712 defined $stem_symtab and exists $stem_symtab->{$leaf}
3713 or return;
3714
3715 # clear all symbols
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 }
3721 warn "cleared package $pkg\n";#d#
3418} 3722}
3419 3723
3420sub do_reload_perl() { 3724sub do_reload_perl() {
3421 # can/must only be called in main 3725 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3423 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3424 return; 3728 return;
3425 } 3729 }
3426 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3427 warn "reloading..."; 3736 warn "reloading...";
3428 3737
3429 warn "entering sync_job"; 3738 warn "entering sync_job";
3430 3739
3431 cf::sync_job { 3740 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3742 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3435 3744
3436 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3747
3439 # if anything goes wrong in here, we should simply crash as we already saved 3748 # if anything goes wrong in here, we should simply crash as we already saved
3440 3749
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3750 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3753 }
3478 3754
3479 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3481 } 3757 %EXT_CORO = ();
3482 3758
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3769
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3494 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3495 } 3779 }
3496 3780
3497 Symbol::delete_package $k; 3781 warn "unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784
3785 warn "... unloading $k";
3786 delete $INC{$k};
3787
3788 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g;
3790
3791 if (my $cb = $k->can ("unload_module")) {
3792 $cb->();
3793 }
3794
3795 clear_package $k;
3498 } 3796 }
3499 3797
3500 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 3801
3504 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3805
3508 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3807 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3511 3809
3512 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3513 3811
3514 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3515 require cf; 3813 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3517 3815
3518 warn "loading config and database again"; 3816 warn "loading config and database again";
3519 cf::reload_config; 3817 cf::reload_config;
3520 3818
3521 warn "loading extensions"; 3819 warn "loading extensions";
3522 cf::load_extensions; 3820 cf::load_extensions;
3523 3821
3822 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3530 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3531 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3532 3835
3533 1 3836 1
3534 } or do { 3837 } or do {
3535 warn $@; 3838 warn $@;
3536 warn "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3840 };
3539 3841
3540 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3541}; 3848};
3542 3849
3543our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3544 3851
3545sub reload_perl() { 3852sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3548 3855
3549 $RELOAD_WATCHER ||= Event->timer ( 3856 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 3857 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 3858
3552 data => WF_AUTOCANCEL, 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 3860 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3556 }, 3862 };
3557 ); 3863 };
3558} 3864}
3559 3865
3560register_command "reload" => sub { 3866register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3562 3868
3575 3881
3576our @WAIT_FOR_TICK; 3882our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3883our @WAIT_FOR_TICK_BEGIN;
3578 3884
3579sub wait_for_tick { 3885sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3886 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3887
3583 my $signal = new Coro::Signal; 3888 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3889 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3890 $signal->wait;
3586} 3891}
3587 3892
3588sub wait_for_tick_begin { 3893sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3894 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3895
3592 my $signal = new Coro::Signal; 3896 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3897 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3898 $signal->wait;
3595} 3899}
3596 3900
3597$TICK_WATCHER = Event->timer ( 3901sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3902 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3903 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3904 unless ++$bug_warning > 10;
3607 return; 3905 return;
3608 } 3906 }
3609 3907
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3908 cf::server_tick; # one server iteration
3613 3909
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK;
3616
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3910 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3912 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3913 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3914 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3915 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3916 };
3917 }
3625 3918
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3920 $sig->send;
3628 } 3921 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3922 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3923 $sig->send;
3631 } 3924 }
3632 3925
3633 $NOW = Event::time; 3926 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3928
3644 _post_tick; 3929 if (0) {
3930 if ($NEXT_TICK) {
3931 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d#
3934 }
3645 }, 3935 }
3646); 3936}
3647 3937
3648{ 3938{
3939 # configure BDB
3940
3649 BDB::min_parallel 8; 3941 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3942 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3943 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3944
3675 unless ($DB_ENV) { 3945 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3946 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 3948 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3949 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3951 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 3952
3682 cf::sync_job { 3953 cf::sync_job {
3683 eval { 3954 eval {
3693 3964
3694 cf::cleanup "db_env_open(db): $@" if $@; 3965 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3966 };
3696 } 3967 }
3697 3968
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3969 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3970 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3971 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3972 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3973 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3974 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3975 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3976 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3977 };
3728} 3978}
3729 3979
3730{ 3980{
3981 # configure IO::AIO
3982
3731 IO::AIO::min_parallel 8; 3983 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3984 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3985 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3986}
3744 3987
3745my $_log_backtrace; 3988my $_log_backtrace;
3746 3989
3747sub _log_backtrace { 3990sub _log_backtrace {
3750 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3751 3994
3752 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3755 async { 3999 async {
3756 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3757 4001
3758 my @bt = fork_call { 4002 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3770 } 4014 }
3771 4015
3772 @funcs 4016 @funcs
3773 }; 4017 };
3774 4018
3775 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 4022 --$_log_backtrace;
3778 }; 4023 };
3779 } else { 4024 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3782 } 4027 }
3783} 4028}
3784 4029
3785# load additional modules 4030# load additional modules
3786use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3787 4033
3788END { cf::emergency_save } 4034END { cf::emergency_save }
3789 4035
37901 40361
3791 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines