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.404 by root, Mon Dec 17 07:27:58 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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 1.86; 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: $@";
2711sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2713 2787
2714 utf8::encode $text; 2788 utf8::encode $text;
2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2716} 2815}
2717 2816
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 2818
2720Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2724 2823
2725=cut 2824=cut
2726 2825
2727# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2729 "c/identify" => { 2834 "c/identify" => {
2730 id => "infobox", 2835 id => "infobox",
2731 title => "Identify", 2836 title => "Identify",
2732 reply => undef, 2837 reply => undef,
2733 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2735 "c/examine" => { 2840 "c/examine" => {
2736 id => "infobox", 2841 id => "infobox",
2737 title => "Examine", 2842 title => "Examine",
2738 reply => undef, 2843 reply => undef,
2739 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2740 }, 2851 },
2741 "c/book" => { 2852 "c/book" => {
2742 id => "infobox", 2853 id => "infobox",
2743 title => "Book", 2854 title => "Book",
2744 reply => undef, 2855 reply => undef,
2760 id => "infobox", 2871 id => "infobox",
2761 title => "Body Parts", 2872 title => "Body Parts",
2762 reply => undef, 2873 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2764 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2765 "c/uptime" => { 2912 "c/uptime" => {
2766 id => "infobox", 2913 id => "infobox",
2767 title => "Uptime", 2914 title => "Uptime",
2768 reply => undef, 2915 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2919 id => "infobox",
2773 title => "Map Info", 2920 title => "Map Info",
2774 reply => undef, 2921 reply => undef,
2775 tooltip => "Information related to the maps", 2922 tooltip => "Information related to the maps",
2776 }, 2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2777); 2938);
2778 2939
2779sub cf::client::send_msg { 2940sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2942
2782 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2783 2945
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2947
2786 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2789 2951
2790 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2794 2954
2795 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2960 }
2802 2961
2803 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2804 } 2963 }
2805 2964
2806 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2807 2966
2808 if ($self->can_msg) {
2809 # default colour, mask it out 2967 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2812 2970
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 2974 );
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 2975
2827 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
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 }
2840} 2977}
2841 2978
2842=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2843 2980
2844Sends an ext event to the client. 2981Sends an ext event to the client.
2847 2984
2848sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2850 2987
2851 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 2993 }
2857} 2994}
2858 2995
2859=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2860 2997
2864 3001
2865sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2867 3004
2868 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3008 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3011 }
2875} 3012}
2876 3013
2877=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2878 3015
3018 3155
3019The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3020 3157
3021 cf::object 3158 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3160 insert remove name archname title slaying race decrease split
3161 value
3024 3162
3025 cf::object::player 3163 cf::object::player
3026 player 3164 player
3027 3165
3028 cf::player 3166 cf::player
3033 3171
3034=cut 3172=cut
3035 3173
3036for ( 3174for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3043) { 3181) {
3044 no strict 'refs'; 3182 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3064 3202
3065 my $qcode = $code; 3203 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3068 3208
3069 local $_; 3209 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3071 3211
3072 my $eval = 3212 my $eval =
3149 { 3289 {
3150 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
3151 3291
3152 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
3154 cf::face::set_visibility $idx, $info->{visibility}; 3295 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3296 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3297 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}; 3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3299
3159 cf::cede_to_tick; 3300 cf::cede_to_tick;
3160 } 3301 }
3161 3302
3162 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
3164 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
3165 or next; 3307 or next;
3308
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3310 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3312 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3331 {
3189 # TODO: for gcfclient pleasure, we should give resources 3332 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3333 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3334 my $res = $facedata->{resource};
3192 3335
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3336 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3339 my $data;
3198 3340
3199 if ($info->{type} & 1) { 3341 if ($info->{type} & 1) {
3200 # prepend meta info 3342 # prepend meta info
3201 3343
3202 my $meta = $enc->encode ({ 3344 my $meta = $enc->encode ({
3203 name => $name, 3345 name => $name,
3204 %{ $info->{meta} || {} }, 3346 %{ $info->{meta} || {} },
3205 }); 3347 });
3206 3348
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type};
3208 } else { 3356 } else {
3209 $data = $info->{data}; 3357 $RESOURCE{$name} = $info;
3210 } 3358 }
3211 3359
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; 3360 cf::cede_to_tick;
3216 } 3361 }
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 } 3362 }
3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3365
3237 1 3366 1
3238} 3367}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3239 3388
3240register_exticmd fx_want => sub { 3389register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3390 my ($ns, $want) = @_;
3242 3391
3243 while (my ($k, $v) = each %$want) { 3392 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3393 $ns->fx_want ($k, $v);
3245 } 3394 }
3246}; 3395};
3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
3247 3406
3248sub reload_regions { 3407sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3409 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3424}
3266 3425
3267sub reload_archetypes { 3426sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3428 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} 3429}
3276 3430
3277sub reload_treasures { 3431sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
3280} 3434}
3281 3435
3282sub reload_resources { 3436sub reload_resources {
3283 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
3284 3438
3439 reload_facedata;
3440 reload_archetypes;
3285 reload_regions; 3441 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3442 reload_treasures;
3290 3443
3291 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3292} 3445}
3293 3446
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3451 or return;
3301 3452
3302 local $/; 3453 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3304 3455
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3457
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $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}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3465 };
3315 warn $@ if $@; 3466 warn $@ if $@;
3316 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3317} 3498}
3318 3499
3319sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3320 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3518 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3520 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3327 }; 3522 };
3328 3523
3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 reload_resources;
3329 reload_config; 3528 reload_config;
3330 db_init; 3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
3331 load_extensions; 3542 load_extensions;
3332 3543
3333 $TICK_WATCHER->start; 3544 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3545
3335 EV::loop; 3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3551 };
3552
3553 main_loop;
3336} 3554}
3337 3555
3338############################################################################# 3556#############################################################################
3339# initialisation and cleanup 3557# initialisation and cleanup
3340 3558
3346 cf::cleanup "SIG$signal"; 3564 cf::cleanup "SIG$signal";
3347 }; 3565 };
3348 } 3566 }
3349} 3567}
3350 3568
3351sub write_runtime { 3569sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3356 3572
3357 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3574
3359 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3360 3576
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3578 or return;
3363 3579
3364 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3377 3593
3378 close $fh 3594 close $fh
3379 or return; 3595 or return;
3380 3596
3381 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3598 and return;
3383 3599
3384 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3385 3601
3386 1 3602 1
3603}
3604
3605our $uuid_lock;
3606our $uuid_skip;
3607
3608sub write_uuid_sync($) {
3609 $uuid_skip ||= $_[0];
3610
3611 return if $uuid_lock;
3612 local $uuid_lock = 1;
3613
3614 my $uuid = "$LOCALDIR/uuid";
3615
3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3617 or return;
3618
3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0;
3628
3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3630 and return;
3631
3632 # always fsync - this file is important
3633 aio_fsync $fh
3634 and return;
3635
3636 close $fh
3637 or return;
3638
3639 aio_rename "$uuid~", $uuid
3640 and return;
3641
3642 warn "uuid file written ($value).\n";
3643
3644 1
3645
3646}
3647
3648sub write_uuid($$) {
3649 my ($skip, $sync) = @_;
3650
3651 $sync ? write_uuid_sync $skip
3652 : async { write_uuid_sync $skip };
3387} 3653}
3388 3654
3389sub emergency_save() { 3655sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3391 3657
3392 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3393 3659
3394 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3395 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3672 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3674 $pl->save;
3404 } 3675 }
3405 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3406 3677
3407 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3681 $map->valid or next;
3411 $map->save; 3682 $map->save;
3412 } 3683 }
3413 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3414 3685
3415 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3689
3690 warn "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n";
3418 }; 3693 };
3419 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3420 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3421} 3701}
3422 3702
3423sub post_cleanup { 3703sub post_cleanup {
3424 my ($make_core) = @_; 3704 my ($make_core) = @_;
3425 3705
3426 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
3428} 3737}
3429 3738
3430sub do_reload_perl() { 3739sub do_reload_perl() {
3431 # can/must only be called in main 3740 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3434 return; 3743 return;
3435 } 3744 }
3436 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3437 warn "reloading..."; 3751 warn "reloading...";
3438 3752
3439 warn "entering sync_job"; 3753 warn "entering sync_job";
3440 3754
3441 cf::sync_job { 3755 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3757 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3445 3759
3446 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3762
3449 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
3450 3764
3451 warn "flushing outstanding aio requests"; 3765 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; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3767 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 } 3768 }
3483 3769
3484 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3486 } 3772 %EXT_CORO = ();
3487 3773
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3784
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3499 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3500 } 3794 }
3501 3795
3502 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
3503 } 3811 }
3504 3812
3505 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3816
3509 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3820
3513 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3822 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3516 3824
3517 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3518 3826
3519 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3520 require cf; 3828 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3522 3830
3523 warn "loading config and database again"; 3831 warn "loading config and database again";
3524 cf::reload_config; 3832 cf::reload_config;
3525 3833
3526 warn "loading extensions"; 3834 warn "loading extensions";
3527 cf::load_extensions; 3835 cf::load_extensions;
3528 3836
3837 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3535 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3536 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3537 3850
3538 1 3851 1
3539 } or do { 3852 } or do {
3540 warn $@; 3853 warn $@;
3541 warn "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3855 };
3544 3856
3545 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3546}; 3863};
3547 3864
3548our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3549 3866
3550sub reload_perl() { 3867sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3553 3870
3871 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions;
3873
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3877 };
3557 }; 3878 };
3558} 3879}
3559 3880
3560register_command "reload" => sub { 3881register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3575 3896
3576our @WAIT_FOR_TICK; 3897our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3898our @WAIT_FOR_TICK_BEGIN;
3578 3899
3579sub wait_for_tick { 3900sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3901 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3902
3583 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3904 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3905 $signal->wait;
3586} 3906}
3587 3907
3588sub wait_for_tick_begin { 3908sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3909 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3910
3592 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3912 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3913 $signal->wait;
3595} 3914}
3596 3915
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3916sub tick {
3598 if ($Coro::current != $Coro::main) { 3917 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3919 unless ++$bug_warning > 10;
3601 return; 3920 return;
3602 } 3921 }
3603 3922
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3923 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK = $_[0]->at;
3610 3924
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3925 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3927 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3928 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3929 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3930 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3931 };
3618 } 3932 }
3619 3933
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3936 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3937 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3938 $sig->send;
3625 } 3939 }
3626 3940
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3941 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3943
3630 _post_tick; 3944 if (0) {
3631}; 3945 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3946 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d#
3949 }
3950 }
3951}
3633 3952
3634{ 3953{
3635 # configure BDB 3954 # configure BDB
3636 3955
3637 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3639 $Coro::BDB::WATCHER->priority (1); 3958 $AnyEvent::BDB::WATCHER->priority (1);
3640 3959
3641 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3642 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3644 | BDB::LOG_AUTOREMOVE, 1); 3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3647 3967
3648 cf::sync_job { 3968 cf::sync_job {
3649 eval { 3969 eval {
3675{ 3995{
3676 # configure IO::AIO 3996 # configure IO::AIO
3677 3997
3678 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3679 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3680 $Coro::AIO::WATCHER->priority (1); 4000 undef $AnyEvent::AIO::WATCHER;
3681} 4001}
3682 4002
3683my $_log_backtrace; 4003my $_log_backtrace;
3684 4004
3685sub _log_backtrace { 4005sub _log_backtrace {
3688 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3689 4009
3690 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3691 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3692 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3693 async { 4014 async {
3694 $Coro::current->{desc} = "abt $msg"; 4015 $Coro::current->{desc} = "abt $msg";
3695 4016
3696 my @bt = fork_call { 4017 my @bt = fork_call {
3697 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3708 } 4029 }
3709 4030
3710 @funcs 4031 @funcs
3711 }; 4032 };
3712 4033
3713 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3714 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3715 --$_log_backtrace; 4037 --$_log_backtrace;
3716 }; 4038 };
3717 } else { 4039 } else {
3718 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3719 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3720 } 4042 }
3721} 4043}
3722 4044
3723# load additional modules 4045# load additional modules
3724use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3725 4048
3726END { cf::emergency_save } 4049END { cf::emergency_save }
3727 4050
37281 40511
3729 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines