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.403 by root, Mon Dec 17 07:09:18 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 EV; 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.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
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;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5; 58use Digest::MD5;
31use Fcntl; 59use Fcntl;
32use YAML::Syck (); 60use YAML::XS ();
33use IO::AIO 2.51 (); 61use IO::AIO ();
34use Time::HiRes; 62use Time::HiRes;
35use Compress::LZF; 63use Compress::LZF;
36use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
37 67
38# configure various modules to our taste 68# configure various modules to our taste
39# 69#
40$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 78
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 79# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 81
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 83
51our %COMMAND = (); 84our %COMMAND = ();
52our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
55our %EXTCMD = (); 88our %EXTCMD = ();
56our %EXTICMD = (); 89our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
59 92
60our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
62 97
63our $CONFDIR = confdir; 98our $CONFDIR = confdir;
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
112our %RESOURCE;
74 113
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 116our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
81 118
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 122our $DB_ENV;
87 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
88our %CFG; 126our %CFG;
89 127
90our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 129our $RUNTIME;
92our $NOW; 130our $NOW;
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 138
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
103our $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 :)
104 148
105binmode STDOUT; 149binmode STDOUT;
106binmode STDERR; 150binmode STDERR;
107 151
108# read virtual server time, if available 152# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
113} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
114 160
115mkdir $_ 161mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 163
118our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
119 165
120sub 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::"} };
121 178
122############################################################################# 179#############################################################################
123 180
124=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
125 182
172returns 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
173per 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.
174 231
175=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
176 233
177This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 236that call.
180 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
181=back 244=back
182 245
183=cut 246=cut
184 247
185BEGIN { 248$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 249 my $msg = join "", @_;
188 250
189 $msg .= "\n" 251 $msg .= "\n"
190 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
191 253
192 $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;
193 255
194 LOG llevError, $msg; 256 LOG llevError, $msg;
195 }; 257};
196} 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};
197 272
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 283for my $pkg (qw(
209 cf::global cf::attachable 284 cf::global cf::attachable
210 cf::object cf::object::player 285 cf::object cf::object::player
211 cf::client cf::player 286 cf::client cf::player
212 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
213 cf::map cf::party cf::region 289 cf::party cf::region
214)) { 290)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 292}
218 293
219$EV::DIED = sub { 294$EV::DIED = sub {
220 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
221}; 296};
222 297
223############################################################################# 298#############################################################################
224 299
225=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
262our $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
263 338
264sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
266 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}
355
267=item cf::lock_wait $string 356=item cf::lock_wait $string
268 357
269Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
270 359
271=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
272 361
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
276returned. 365returned.
277 366
278Locks 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
279deadlocked coro. 368deadlocked coro.
285 374
286Return 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.
287 376
288=cut 377=cut
289 378
290our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 380
293sub lock_wait($) { 381sub lock_wait($) {
294 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 383}
307 384
308sub lock_acquire($) { 385sub lock_acquire($) {
309 my ($key) = @_; 386 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 387}
323 388
324sub lock_active($) { 389sub lock_active($) {
325 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 391}
329 392
330sub freeze_mainloop { 393sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
332 395
333 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 397}
339 398
340=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
341 400
342Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
397 } 456 }
398 } 457 }
399}; 458};
400 459
401sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
402 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
403 464
404 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
406 467
443 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
445 506
446 LOG llevError, Carp::longmess "sync job";#d# 507 LOG llevError, Carp::longmess "sync job";#d#
447 508
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
451 510
452 my $busy = 1; 511 my $busy = 1;
453 my @res; 512 my @res;
454 513
465 } else { 524 } else {
466 EV::loop EV::LOOP_ONESHOT; 525 EV::loop EV::LOOP_ONESHOT;
467 } 526 }
468 } 527 }
469 528
470 $time = EV::time - $time; 529 my $time = EV::time - $time;
471 530
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
476 532
477 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
478 } else { 534 } else {
479 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
480 536
522 reset_signals; 578 reset_signals;
523 &$cb 579 &$cb
524 }, @args; 580 }, @args;
525 581
526 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
527} 610}
528 611
529=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
530 613
531Returns a single value from the environment database. 614Returns a single value from the environment database.
670 753
671############################################################################# 754#############################################################################
672 755
673=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
674 757
675Many 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
676attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
678 761
679In 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>
680C<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
730=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
731 814
732Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
734 817
735Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
736that 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.
737 820
738These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
739 822
740=over 4 823=over 4
968 } 1051 }
969 1052
970 0 1053 0
971} 1054}
972 1055
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1057
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1059
977Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
978 1061
1031 1114
1032sub reattach { 1115sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1117 my ($obj) = @_;
1035 1118
1119 # no longer needed after getting rid of delete_package?
1036 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
1037 1121
1038 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1039 1123
1040 @$registry = (); 1124 @$registry = ();
1041 1125
1087 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1090 1174
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 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 }
1095 close $fh; 1182 aio_close $fh;
1096 1183
1097 if (@$objs) { 1184 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1102 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 }
1103 close $fh; 1193 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1195 }
1106 } else { 1196 } else {
1107 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1108 } 1198 }
1109 1199
1110 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1204 } else {
1112 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1113 } 1206 }
1114 } else { 1207 } else {
1115 aio_unlink $filename; 1208 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1117 } 1210 }
1208 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1209 1302
1210 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1211} 1304}
1212 1305
1306use File::Glob ();
1307
1213cf::player->attach ( 1308cf::player->attach (
1214 on_command => sub { 1309 on_command => sub {
1215 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1216 1311
1217 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1249 1344
1250 cf::override; 1345 cf::override;
1251 }, 1346 },
1252); 1347);
1253 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
1254sub load_extensions { 1362sub load_extensions {
1255 cf::sync_job { 1363 cf::sync_job {
1256 my %todo; 1364 my %todo;
1257 1365
1258 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1277 1385
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1388
1281 $ext{source} = 1389 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1284 . $source 1392 . $source
1285 . "\n};\n1"; 1393 . "\n};\n1";
1286 1394
1287 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1303 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1305 1413
1306 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1415 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1417 }
1311 1418
1312 warn $msg; 1419 warn $msg;
1313 } 1420 }
1314 1421
1328 1435
1329=back 1436=back
1330 1437
1331=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1332 1439
1333Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1334 1441
1335=cut 1442=cut
1336 1443
1337package cf::player; 1444package cf::player;
1338 1445
1381 1488
1382sub exists($) { 1489sub exists($) {
1383 my ($login) = @_; 1490 my ($login) = @_;
1384 1491
1385 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1387} 1494}
1388 1495
1389sub find($) { 1496sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1498 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1511 or return;
1405 1512
1406 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1407 or return; 1514 or return;
1515
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1411 } 1519 }
1412 } 1520 }
1422 1530
1423 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1424 1532
1425 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1427 1537
1428 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1539 cf::cede_to_tick;
1430} 1540}
1431 1541
1463 my ($pl) = @_; 1573 my ($pl) = @_;
1464 1574
1465 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1466 1576
1467 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1468 $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
1469 1579
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1474 1586
1475 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1627
1516 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1517 my $path = path $login; 1629 my $path = path $login;
1518 1630
1519 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1637 }
1525 1638
1556 } 1669 }
1557 1670
1558 \@paths 1671 \@paths
1559} 1672}
1560 1673
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1675
1563Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1677
1654=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1655 1679
1656Sends an ext reply to the player. 1680Sends an ext reply to the player.
1657 1681
1724our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1726 1750
1727sub generate_random_map { 1751sub generate_random_map {
1728 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
1729 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1757 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1855 1882
1856# the temporary/swap location 1883# the temporary/swap location
1857sub save_path { 1884sub save_path {
1858 my ($self) = @_; 1885 my ($self) = @_;
1859 1886
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1862} 1889}
1863 1890
1864# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1865sub uniq_path { 1892sub uniq_path {
1866 my ($self) = @_; 1893 my ($self) = @_;
1867 1894
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1897}
1880 1898
1881sub decay_objects { 1899sub decay_objects {
1882 my ($self) = @_; 1900 my ($self) = @_;
1883 1901
1967sub find { 1985sub find {
1968 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1969 1987
1970 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1971 1989
1972 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1992
1975 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1980 or return; 1995 or return;
1981 1996
1982 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1983 1998
1985 or return; 2000 or return;
1986 2001
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
1990 undef $guard1; 2006 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2007 $map->reset;
1993 return find $path; 2008 return find $path;
1994 } 2009 }
1995 2010
1996 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2039 $f->skip_block;
2025 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2026 or return; 2041 or return;
2027 2042
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2029 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2030 2045
2031 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2047 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2067 $self->decay_objects;
2053 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2054 $self->update_buttons; 2069 $self->update_buttons;
2055 cf::cede_to_tick; 2070 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2071 $self->activate;
2059 } 2072 }
2060 2073
2061 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2063 2076
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2078 }
2066 2079
2067 $self->post_load; 2080 $self->post_load;
2068} 2081}
2069 2082
2127 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2128 2141
2129 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2130 2143
2131 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2146 }
2134 2147
2135 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2136 2149
2137 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2187 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2177 }; 2190 };
2178 2191
2192 cf::get_slot 0.02;
2193
2179 if ($uniq) { 2194 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2197 } else {
2183 $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);
2191 $self->save; 2206 $self->save;
2192 2207
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2209
2195 return if $self->players; 2210 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2198 2213
2199 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2200 2215
2201 $self->deactivate; 2216 $self->deactivate;
2226 2241
2227 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2243
2229 return if $self->players; 2244 return if $self->players;
2230 2245
2231 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2232 2247
2233 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2234 2249
2235 # need to save uniques path 2250 # need to save uniques path
2236 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2319 2334
2320sub unique_maps() { 2335sub unique_maps() {
2321 [ 2336 [
2322 map { 2337 map {
2323 utf8::decode $_; 2338 utf8::decode $_;
2324 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2325 ? normalise $_ 2342 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2344 ]
2329} 2345}
2330 2346
2331package 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}
2332 2378
2333=back 2379=back
2334 2380
2335=head3 cf::object 2381=head3 cf::object
2336 2382
2340 2386
2341=over 4 2387=over 4
2342 2388
2343=item $ob->inv_recursive 2389=item $ob->inv_recursive
2344 2390
2345Returns 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.
2346 2393
2347=cut 2394=cut
2348 2395
2349sub inv_recursive_; 2396sub inv_recursive_;
2350sub inv_recursive_ { 2397sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2356} 2403}
2357 2404
2358=item $ref = $ob->ref 2405=item $ref = $ob->ref
2359 2406
2360creates 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.
2361 2408
2362=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2363 2410
2364returns 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,
2365even if the object actually exists. May block. 2412even if the object actually exists. May block.
2397can 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
2398dialogue with the given NPC character. 2445dialogue with the given NPC character.
2399 2446
2400=cut 2447=cut
2401 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
2402# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2464# with dialog boxes.
2404#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
2405sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2418 $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));
2419 2480
2420 } else { 2481 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2484 }
2424 } 2485 }
2425} 2486}
2426 2487
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2513
2453=item $player_object->enter_link 2514=item $player_object->enter_link
2454 2515
2455Freezes 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}>).
2456 2517
2457The 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.
2458I<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.
2459 2522
2460Will never block. 2523Will never block.
2461 2524
2462=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2463 2526
2515 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2517 2580
2518 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2521 2584
2522 $map->load; 2585 $map->load;
2523 $map->load_neighbours; 2586 $map->load_neighbours;
2524 2587
2525 return unless $self->contr->active; 2588 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2589
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $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;
2530} 2595}
2531 2596
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2598
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2538be 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 >>.
2539 2607
2540=cut 2608=cut
2541 2609
2542our $GOTOGEN; 2610our $GOTOGEN;
2543 2611
2622} 2690}
2623 2691
2624sub prepare_random_map { 2692sub prepare_random_map {
2625 my ($exit) = @_; 2693 my ($exit) = @_;
2626 2694
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2697 # that depends on the exit object
2632 2698
2633 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2701 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2640 } 2708 }
2641 2709
2642 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2643 2711
2644 my $data = cf::encode_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2647 2715
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2718 undef $fh;
2651 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2652 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2655 } 2727 }
2656} 2728}
2657 2729
2658sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2660 2732
2661 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2662 2734
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2735 $self->enter_link;
2675 2736
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2737 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2682 2739
2683 $self->deactivate_recursive; # just to be sure
2684 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
2685 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2686 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
2687 1; 2761 1
2688 }) { 2762 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "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. "
2691 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2767
2694 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2724 2798
2725=cut 2799=cut
2726 2800
2727# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2729 "c/identify" => { 2809 "c/identify" => {
2730 id => "infobox", 2810 id => "infobox",
2731 title => "Identify", 2811 title => "Identify",
2732 reply => undef, 2812 reply => undef,
2733 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2735 "c/examine" => { 2815 "c/examine" => {
2736 id => "infobox", 2816 id => "infobox",
2737 title => "Examine", 2817 title => "Examine",
2738 reply => undef, 2818 reply => undef,
2739 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",
2740 }, 2826 },
2741 "c/book" => { 2827 "c/book" => {
2742 id => "infobox", 2828 id => "infobox",
2743 title => "Book", 2829 title => "Book",
2744 reply => undef, 2830 reply => undef,
2760 id => "infobox", 2846 id => "infobox",
2761 title => "Body Parts", 2847 title => "Body Parts",
2762 reply => undef, 2848 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2764 }, 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 },
2765 "c/uptime" => { 2887 "c/uptime" => {
2766 id => "infobox", 2888 id => "infobox",
2767 title => "Uptime", 2889 title => "Uptime",
2768 reply => undef, 2890 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2894 id => "infobox",
2773 title => "Map Info", 2895 title => "Map Info",
2774 reply => undef, 2896 reply => undef,
2775 tooltip => "Information related to the maps", 2897 tooltip => "Information related to the maps",
2776 }, 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,
2777); 2913);
2778 2914
2779sub cf::client::send_msg { 2915sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2917
2782 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2783 2920
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2922
2786 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2789 2926
2790 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2794 2929
2795 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2935 }
2802 2936
2803 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2804 } 2938 }
2805 2939
2806 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2807 2941
2808 if ($self->can_msg) {
2809 # default colour, mask it out 2942 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2812 2945
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 2949 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 2950
2827 $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};
2828 2954
2829 utf8::encode $msg; 2955 # split very large packets
2830 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2831 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2832 # COMMAND/INFO 2958 $pkt = "frag";
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 } 2959 }
2960
2961 $self->send_packet ($pkt);
2840} 2962}
2841 2963
2842=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2843 2965
2844Sends an ext event to the client. 2966Sends an ext event to the client.
3018 3140
3019The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3020 3142
3021 cf::object 3143 cf::object
3022 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
3023 insert remove name archname title slaying race decrease_ob_nr 3145 insert remove name archname title slaying race decrease split
3146 value
3024 3147
3025 cf::object::player 3148 cf::object::player
3026 player 3149 player
3027 3150
3028 cf::player 3151 cf::player
3033 3156
3034=cut 3157=cut
3035 3158
3036for ( 3159for (
3037 ["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
3038 insert remove inv name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3043) { 3166) {
3044 no strict 'refs'; 3167 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3064 3187
3065 my $qcode = $code; 3188 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3068 3193
3069 local $_; 3194 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3071 3196
3072 my $eval = 3197 my $eval =
3149 { 3274 {
3150 my $faces = $facedata->{faceinfo}; 3275 my $faces = $facedata->{faceinfo};
3151 3276
3152 while (my ($face, $info) = each %$faces) { 3277 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3278 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279
3154 cf::face::set_visibility $idx, $info->{visibility}; 3280 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3281 cf::face::set_magicmap $idx, $info->{magicmap};
3156 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};
3157 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};
3158 3284
3159 cf::cede_to_tick; 3285 cf::cede_to_tick;
3160 } 3286 }
3161 3287
3162 while (my ($face, $info) = each %$faces) { 3288 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3289 next unless $info->{smooth};
3290
3164 my $idx = cf::face::find $face 3291 my $idx = cf::face::find $face
3165 or next; 3292 or next;
3293
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3294 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3295 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3296 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3297 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3298 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3316 {
3189 # TODO: for gcfclient pleasure, we should give resources 3317 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3318 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3319 my $res = $facedata->{resource};
3192 3320
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3321 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3323 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3324 my $data;
3198 3325
3199 if ($info->{type} & 1) { 3326 if ($info->{type} & 1) {
3200 # prepend meta info 3327 # prepend meta info
3201 3328
3202 my $meta = $enc->encode ({ 3329 my $meta = $enc->encode ({
3203 name => $name, 3330 name => $name,
3204 %{ $info->{meta} || {} }, 3331 %{ $info->{meta} || {} },
3205 }); 3332 });
3206 3333
3207 $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};
3208 } else { 3341 } else {
3209 $data = $info->{data}; 3342 $RESOURCE{$name} = $info;
3210 } 3343 }
3211 3344
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3345 cf::cede_to_tick;
3216 } 3346 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3347 }
3348
3349 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3350
3237 1 3351 1
3238} 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});
3239 3373
3240register_exticmd fx_want => sub { 3374register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3375 my ($ns, $want) = @_;
3242 3376
3243 while (my ($k, $v) = each %$want) { 3377 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3378 $ns->fx_want ($k, $v);
3245 } 3379 }
3246}; 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}
3247 3391
3248sub reload_regions { 3392sub reload_regions {
3249 # 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
3250 # for this (global event?) 3394 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3395 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3409}
3266 3410
3267sub reload_archetypes { 3411sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3412 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3413 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3414}
3276 3415
3277sub reload_treasures { 3416sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3417 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3418 or die "unable to load treasurelists\n";
3280} 3419}
3281 3420
3282sub reload_resources { 3421sub reload_resources {
3283 warn "reloading resource files...\n"; 3422 warn "reloading resource files...\n";
3284 3423
3424 reload_facedata;
3425 reload_archetypes;
3285 reload_regions; 3426 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3427 reload_treasures;
3290 3428
3291 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3292} 3430}
3293 3431
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3436 or return;
3301 3437
3302 local $/; 3438 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3304 3440
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3442
3307 $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};
3308 $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};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3450 };
3315 warn $@ if $@; 3451 warn $@ if $@;
3316 } 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;
3317} 3483}
3318 3484
3319sub 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
3320 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3322 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#
3323 (async { 3503 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3327 }; 3507 };
3328 3508
3509 evthread_start IO::AIO::poll_fileno;
3510
3511 cf::sync_job {
3512 reload_resources;
3329 reload_config; 3513 reload_config;
3330 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
3331 load_extensions; 3527 load_extensions;
3332 3528
3333 $TICK_WATCHER->start; 3529 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3530
3335 EV::loop; 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;
3336} 3539}
3337 3540
3338############################################################################# 3541#############################################################################
3339# initialisation and cleanup 3542# initialisation and cleanup
3340 3543
3346 cf::cleanup "SIG$signal"; 3549 cf::cleanup "SIG$signal";
3347 }; 3550 };
3348 } 3551 }
3349} 3552}
3350 3553
3351sub write_runtime { 3554sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3356 3557
3357 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3559
3359 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3360 3561
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3563 or return;
3363 3564
3364 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3377 3578
3378 close $fh 3579 close $fh
3379 or return; 3580 or return;
3380 3581
3381 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3583 and return;
3383 3584
3384 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3385 3586
3386 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 };
3387} 3638}
3388 3639
3389sub emergency_save() { 3640sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3391 3642
3392 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3393 3644
3394 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
3395 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3657 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3659 $pl->save;
3404 } 3660 }
3405 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3406 3662
3407 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3666 $map->valid or next;
3411 $map->save; 3667 $map->save;
3412 } 3668 }
3413 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3414 3670
3415 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3417 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";
3418 }; 3678 };
3419 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
3420 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3421} 3686}
3422 3687
3423sub post_cleanup { 3688sub post_cleanup {
3424 my ($make_core) = @_; 3689 my ($make_core) = @_;
3425 3690
3426 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3427 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#
3428} 3722}
3429 3723
3430sub do_reload_perl() { 3724sub do_reload_perl() {
3431 # can/must only be called in main 3725 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3434 return; 3728 return;
3435 } 3729 }
3436 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3437 warn "reloading..."; 3736 warn "reloading...";
3438 3737
3439 warn "entering sync_job"; 3738 warn "entering sync_job";
3440 3739
3441 cf::sync_job { 3740 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3742 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3445 3744
3446 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3747
3449 # 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
3450 3749
3451 warn "flushing outstanding aio requests"; 3750 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3753 }
3483 3754
3484 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3486 } 3757 %EXT_CORO = ();
3487 3758
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3769
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3499 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3500 } 3779 }
3501 3780
3502 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;
3503 } 3796 }
3504 3797
3505 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3507 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);
3508 3801
3509 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3805
3513 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3807 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3516 3809
3517 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3518 3811
3519 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3520 require cf; 3813 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3522 3815
3523 warn "loading config and database again"; 3816 warn "loading config and database again";
3524 cf::reload_config; 3817 cf::reload_config;
3525 3818
3526 warn "loading extensions"; 3819 warn "loading extensions";
3527 cf::load_extensions; 3820 cf::load_extensions;
3528 3821
3822 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3535 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3536 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3537 3835
3538 1 3836 1
3539 } or do { 3837 } or do {
3540 warn $@; 3838 warn $@;
3541 warn "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3840 };
3544 3841
3545 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3546}; 3848};
3547 3849
3548our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3549 3851
3550sub reload_perl() { 3852sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3553 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3862 };
3557 }; 3863 };
3558} 3864}
3559 3865
3560register_command "reload" => sub { 3866register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
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 = EV::periodic_ns 0, $TICK, 0, sub { 3901sub tick {
3598 if ($Coro::current != $Coro::main) { 3902 if ($Coro::current != $Coro::main) {
3599 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"
3600 unless ++$bug_warning > 10; 3904 unless ++$bug_warning > 10;
3601 return; 3905 return;
3602 } 3906 }
3603 3907
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3908 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610 3909
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3910 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3912 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3913 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3914 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3915 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3916 };
3618 } 3917 }
3619 3918
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3921 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3922 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3923 $sig->send;
3625 } 3924 }
3626 3925
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3926 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3928
3630 _post_tick; 3929 if (0) {
3631}; 3930 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3931 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d#
3934 }
3935 }
3936}
3633 3937
3634{ 3938{
3635 # configure BDB 3939 # configure BDB
3636 3940
3637 BDB::min_parallel 8; 3941 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3942 BDB::max_poll_reqs $TICK * 0.1;
3639 $Coro::BDB::WATCHER->priority (1); 3943 $AnyEvent::BDB::WATCHER->priority (1);
3640 3944
3641 unless ($DB_ENV) { 3945 unless ($DB_ENV) {
3642 $DB_ENV = BDB::db_env_create; 3946 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3644 | 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;
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3951 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3647 3952
3648 cf::sync_job { 3953 cf::sync_job {
3649 eval { 3954 eval {
3675{ 3980{
3676 # configure IO::AIO 3981 # configure IO::AIO
3677 3982
3678 IO::AIO::min_parallel 8; 3983 IO::AIO::min_parallel 8;
3679 IO::AIO::max_poll_time $TICK * 0.1; 3984 IO::AIO::max_poll_time $TICK * 0.1;
3680 $Coro::AIO::WATCHER->priority (1); 3985 undef $AnyEvent::AIO::WATCHER;
3681} 3986}
3682 3987
3683my $_log_backtrace; 3988my $_log_backtrace;
3684 3989
3685sub _log_backtrace { 3990sub _log_backtrace {
3688 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3689 3994
3690 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3691 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3692 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3693 async { 3999 async {
3694 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3695 4001
3696 my @bt = fork_call { 4002 my @bt = fork_call {
3697 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3708 } 4014 }
3709 4015
3710 @funcs 4016 @funcs
3711 }; 4017 };
3712 4018
3713 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3714 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3715 --$_log_backtrace; 4022 --$_log_backtrace;
3716 }; 4023 };
3717 } else { 4024 } else {
3718 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3719 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3720 } 4027 }
3721} 4028}
3722 4029
3723# load additional modules 4030# load additional modules
3724use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3725 4033
3726END { cf::emergency_save } 4034END { cf::emergency_save }
3727 4035
37281 40361
3729 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines