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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.499 by root, Sun Jan 10 17:43:46 2010 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;
31use Fcntl; 58use Fcntl;
32use YAML (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 80
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
71our %RESOURCE; 111our %RESOURCE;
72 112
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 115our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
79 117
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 121our $DB_ENV;
85 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
86our %CFG; 125our %CFG;
87 126
88our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 128our $RUNTIME;
90our $NOW; 129our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 137
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
102 147
103binmode STDOUT; 148binmode STDOUT;
104binmode STDERR; 149binmode STDERR;
105 150
106# read virtual server time, if available 151# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
111} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
112 159
113mkdir $_ 160mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 162
116our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
117 164
118sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 177
120############################################################################# 178#############################################################################
121 179
122=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
123 181
170returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 230
173=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
174 232
175This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 235that call.
178 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
179=back 243=back
180 244
181=cut 245=cut
182 246
183BEGIN { 247$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 248 my $msg = join "", @_;
186 249
187 $msg .= "\n" 250 $msg .= "\n"
188 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
189 252
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 254
192 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194}
195 257
196$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
198 262
199 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 265 return;#d#
202 }#d# 266 }#d#
203 267
204 # kill coroutine otherwise 268 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 269 Coro::terminate
207}; 270};
208
209$SIG{__DIE__} = sub { }; #d#?
210 271
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 282for my $pkg (qw(
222 cf::global cf::attachable 283 cf::global cf::attachable
223 cf::object cf::object::player 284 cf::object cf::object::player
224 cf::client cf::player 285 cf::client cf::player
225 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
226 cf::map cf::party cf::region 288 cf::party cf::region
227)) { 289)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 291}
231 292
232$EV::DIED = sub { 293$EV::DIED = sub {
233 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
234}; 295};
235 296
236############################################################################# 297#############################################################################
237 298
238=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 337
277sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
279 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
280=item cf::lock_wait $string 355=item cf::lock_wait $string
281 356
282Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
283 358
284=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
285 360
286Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
287a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
288for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
289returned. 364returned.
290 365
291Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro. 367deadlocked coro.
298 373
299Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
300 375
301=cut 376=cut
302 377
303our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 379
306sub lock_wait($) { 380sub lock_wait($) {
307 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 382}
320 383
321sub lock_acquire($) { 384sub lock_acquire($) {
322 my ($key) = @_; 385 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 386}
336 387
337sub lock_active($) { 388sub lock_active($) {
338 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 390}
342 391
343sub freeze_mainloop { 392sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
345 394
346 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 396}
352 397
353=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
354 399
355Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
410 } 455 }
411 } 456 }
412}; 457};
413 458
414sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
415 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
416 463
417 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
419 466
456 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
458 505
459 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
460 507
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
464 509
465 my $busy = 1; 510 my $busy = 1;
466 my @res; 511 my @res;
467 512
478 } else { 523 } else {
479 EV::loop EV::LOOP_ONESHOT; 524 EV::loop EV::LOOP_ONESHOT;
480 } 525 }
481 } 526 }
482 527
483 $time = EV::time - $time; 528 my $time = EV::time - $time;
484 529
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
489 531
490 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
491 } else { 533 } else {
492 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
493 535
535 reset_signals; 577 reset_signals;
536 &$cb 578 &$cb
537 }, @args; 579 }, @args;
538 580
539 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
540} 609}
541 610
542=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
543 612
544Returns a single value from the environment database. 613Returns a single value from the environment database.
683 752
684############################################################################# 753#############################################################################
685 754
686=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
687 756
688Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
691 760
692In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
693C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
744 813
745Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
747 816
748Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
750 819
751These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
752 821
753=over 4 822=over 4
1044 1113
1045sub reattach { 1114sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1116 my ($obj) = @_;
1048 1117
1118 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1120
1051 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1052 1122
1053 @$registry = (); 1123 @$registry = ();
1054 1124
1100 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1103 1173
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1108 close $fh; 1181 aio_close $fh;
1109 1182
1110 if (@$objs) { 1183 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1116 close $fh; 1192 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1194 }
1119 } else { 1195 } else {
1120 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1121 } 1197 }
1122 1198
1123 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1203 } else {
1125 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1126 } 1205 }
1127 } else { 1206 } else {
1128 aio_unlink $filename; 1207 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1130 } 1209 }
1221 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1222 1301
1223 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1224} 1303}
1225 1304
1305use File::Glob ();
1306
1226cf::player->attach ( 1307cf::player->attach (
1227 on_command => sub { 1308 on_command => sub {
1228 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1229 1310
1230 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1262 1343
1263 cf::override; 1344 cf::override;
1264 }, 1345 },
1265); 1346);
1266 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1267sub load_extensions { 1361sub load_extensions {
1268 cf::sync_job { 1362 cf::sync_job {
1269 my %todo; 1363 my %todo;
1270 1364
1271 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1290 1384
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1387
1294 $ext{source} = 1388 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1297 . $source 1391 . $source
1298 . "\n};\n1"; 1392 . "\n};\n1";
1299 1393
1300 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1340 1434
1341=back 1435=back
1342 1436
1343=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1344 1438
1345Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1346 1440
1347=cut 1441=cut
1348 1442
1349package cf::player; 1443package cf::player;
1350 1444
1393 1487
1394sub exists($) { 1488sub exists($) {
1395 my ($login) = @_; 1489 my ($login) = @_;
1396 1490
1397 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1399} 1493}
1400 1494
1401sub find($) { 1495sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1497 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1510 or return;
1417 1511
1418 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1419 or return; 1513 or return;
1514
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1423 } 1518 }
1424 } 1519 }
1434 1529
1435 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1436 1531
1437 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1439 1536
1440 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1538 cf::cede_to_tick;
1442} 1539}
1443 1540
1475 my ($pl) = @_; 1572 my ($pl) = @_;
1476 1573
1477 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1478 1575
1479 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1481 1578
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1486 1585
1487 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1527 1626
1528 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1529 my $path = path $login; 1628 my $path = path $login;
1530 1629
1531 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1636 }
1537 1637
1568 } 1668 }
1569 1669
1570 \@paths 1670 \@paths
1571} 1671}
1572 1672
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1674
1575Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665 1676
1666=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1667 1678
1668Sends an ext reply to the player. 1679Sends an ext reply to the player.
1669 1680
1736our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1738 1749
1739sub generate_random_map { 1750sub generate_random_map {
1740 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1741 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1756 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1867 1881
1868# the temporary/swap location 1882# the temporary/swap location
1869sub save_path { 1883sub save_path {
1870 my ($self) = @_; 1884 my ($self) = @_;
1871 1885
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1874} 1888}
1875 1889
1876# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1877sub uniq_path { 1891sub uniq_path {
1878 my ($self) = @_; 1892 my ($self) = @_;
1879 1893
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1882}
1883
1884# and all this just because we cannot iterate over
1885# all maps in C++...
1886sub change_all_map_light {
1887 my ($change) = @_;
1888
1889 $_->change_map_light ($change)
1890 for grep $_->outdoor, values %cf::MAP;
1891} 1896}
1892 1897
1893sub decay_objects { 1898sub decay_objects {
1894 my ($self) = @_; 1899 my ($self) = @_;
1895 1900
1979sub find { 1984sub find {
1980 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1981 1986
1982 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1983 1988
1984 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1986 1991
1987 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1991 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1992 or return; 1994 or return;
1993 1995
1994 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1995 1997
1997 or return; 1999 or return;
1998 2000
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2002 undef $guard1; 2005 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2006 $map->reset;
2005 return find $path; 2007 return find $path;
2006 } 2008 }
2007 2009
2008 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2038 $f->skip_block;
2037 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2038 or return; 2040 or return;
2039 2041
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2041 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2042 2044
2043 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2046 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2063 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2064 $self->decay_objects; 2066 $self->decay_objects;
2065 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2066 $self->update_buttons; 2068 $self->update_buttons;
2067 cf::cede_to_tick; 2069 cf::cede_to_tick;
2068 $self->set_darkness_map;
2069 cf::cede_to_tick;
2070 $self->activate; 2070 $self->activate;
2071 } 2071 }
2072 2072
2073 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2075 2075
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2077 }
2078 2078
2079 $self->post_load; 2079 $self->post_load;
2080} 2080}
2081 2081
2139 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2140 2140
2141 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2142 2142
2143 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2145 }
2146 2146
2147 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2148 2148
2149 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2186 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2189 }; 2189 };
2190 2190
2191 cf::get_slot 0.02;
2192
2191 if ($uniq) { 2193 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2196 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2203 $self->save; 2205 $self->save;
2204 2206
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2208
2207 return if $self->players; 2209 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2210 2212
2211 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2212 2214
2213 $self->deactivate; 2215 $self->deactivate;
2238 2240
2239 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2240 2242
2241 return if $self->players; 2243 return if $self->players;
2242 2244
2243 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2244 2246
2245 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2246 2248
2247 # need to save uniques path 2249 # need to save uniques path
2248 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2331 2333
2332sub unique_maps() { 2334sub unique_maps() {
2333 [ 2335 [
2334 map { 2336 map {
2335 utf8::decode $_; 2337 utf8::decode $_;
2336 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2337 ? normalise $_ 2341 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2343 ]
2341} 2344}
2342 2345
2343package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2344 2377
2345=back 2378=back
2346 2379
2347=head3 cf::object 2380=head3 cf::object
2348 2381
2352 2385
2353=over 4 2386=over 4
2354 2387
2355=item $ob->inv_recursive 2388=item $ob->inv_recursive
2356 2389
2357Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2358 2392
2359=cut 2393=cut
2360 2394
2361sub inv_recursive_; 2395sub inv_recursive_;
2362sub inv_recursive_ { 2396sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2368} 2402}
2369 2403
2370=item $ref = $ob->ref 2404=item $ref = $ob->ref
2371 2405
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2406Creates and returns a persistent reference to an object that can be stored as a string.
2373 2407
2374=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2375 2409
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2411even if the object actually exists. May block.
2409can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2444dialogue with the given NPC character.
2411 2445
2412=cut 2446=cut
2413 2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2461
2414# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2463# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2479
2432 } else { 2480 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2483 }
2436 } 2484 }
2437} 2485}
2438 2486
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2512
2465=item $player_object->enter_link 2513=item $player_object->enter_link
2466 2514
2467Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2468 2516
2469The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2470I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2471 2521
2472Will never block. 2522Will never block.
2473 2523
2474=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2475 2525
2527 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2528 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2529 2579
2530 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2531 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2532 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2533 2583
2534 $map->load; 2584 $map->load;
2535 $map->load_neighbours; 2585 $map->load_neighbours;
2536 2586
2537 return unless $self->contr->active; 2587 return unless $self->contr->active;
2538 $self->activate_recursive;
2539 2588
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2542} 2594}
2543 2595
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2545 2597
2546Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2602be called at the end of this process.
2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2551 2606
2552=cut 2607=cut
2553 2608
2554our $GOTOGEN; 2609our $GOTOGEN;
2555 2610
2634} 2689}
2635 2690
2636sub prepare_random_map { 2691sub prepare_random_map {
2637 my ($exit) = @_; 2692 my ($exit) = @_;
2638 2693
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2696 # that depends on the exit object
2644 2697
2645 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2700 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2652 } 2707 }
2653 2708
2654 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2655 2710
2656 my $data = cf::encode_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2659 2714
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2717 undef $fh;
2663 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2664 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2667 } 2726 }
2668} 2727}
2669 2728
2670sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2672 2731
2673 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2674 2733
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2734 $self->enter_link;
2687 2735
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2736 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2737 $Coro::current->{desc} = "enter_exit";
2694 2738
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2697 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2698 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2699 1; 2760 1
2700 }) { 2761 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2766
2706 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2723sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2725 2786
2726 utf8::encode $text; 2787 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2728} 2814}
2729 2815
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2817
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2736 2822
2737=cut 2823=cut
2738 2824
2739# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2741 "c/identify" => { 2833 "c/identify" => {
2742 id => "infobox", 2834 id => "infobox",
2743 title => "Identify", 2835 title => "Identify",
2744 reply => undef, 2836 reply => undef,
2745 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2747 "c/examine" => { 2839 "c/examine" => {
2748 id => "infobox", 2840 id => "infobox",
2749 title => "Examine", 2841 title => "Examine",
2750 reply => undef, 2842 reply => undef,
2751 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2850 },
2753 "c/book" => { 2851 "c/book" => {
2754 id => "infobox", 2852 id => "infobox",
2755 title => "Book", 2853 title => "Book",
2756 reply => undef, 2854 reply => undef,
2772 id => "infobox", 2870 id => "infobox",
2773 title => "Body Parts", 2871 title => "Body Parts",
2774 reply => undef, 2872 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2776 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2777 "c/uptime" => { 2911 "c/uptime" => {
2778 id => "infobox", 2912 id => "infobox",
2779 title => "Uptime", 2913 title => "Uptime",
2780 reply => undef, 2914 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 2918 id => "infobox",
2785 title => "Map Info", 2919 title => "Map Info",
2786 reply => undef, 2920 reply => undef,
2787 tooltip => "Information related to the maps", 2921 tooltip => "Information related to the maps",
2788 }, 2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2789); 2937);
2790 2938
2791sub cf::client::send_msg { 2939sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2941
2794 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2795 2944
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 2946
2798 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2801 2950
2802 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2806 2953
2807 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2812 if $self->can_msg;
2813 } 2959 }
2814 2960
2815 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2816 } 2962 }
2817 2963
2818 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2819 2965
2820 if ($self->can_msg) {
2821 # default colour, mask it out 2966 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2824 2969
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 } else { 2973 );
2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838 2974
2839 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2840
2841 utf8::encode $msg;
2842
2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2848 $self->send_packet ("drawinfo $color $msg")
2849 }
2850 }
2851 }
2852} 2976}
2853 2977
2854=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2855 2979
2856Sends an ext event to the client. 2980Sends an ext event to the client.
2859 2983
2860sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2862 2986
2863 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 } 2992 }
2869} 2993}
2870 2994
2871=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2872 2996
2876 3000
2877sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2879 3003
2880 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove 3007 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 } 3010 }
2887} 3011}
2888 3012
2889=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2890 3014
3017our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3018 3142
3019$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3020 3144
3021$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3023 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3024 sort time 3148 sort time
3025)); 3149));
3026 3150
3027# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
3030 3154
3031The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3032 3156
3033 cf::object 3157 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
3036 3161
3037 cf::object::player 3162 cf::object::player
3038 player 3163 player
3039 3164
3040 cf::player 3165 cf::player
3045 3170
3046=cut 3171=cut
3047 3172
3048for ( 3173for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3052 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3054 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3055) { 3180) {
3056 no strict 'refs'; 3181 no strict 'refs';
3057 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3058 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 3201
3077 my $qcode = $code; 3202 my $qcode = $code;
3078 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3079 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3080 3205
3206 %vars = (_dummy => 0) unless %vars;
3207
3208 my @res;
3081 local $_; 3209 local $_;
3082 local @safe::cf::_safe_eval_args = values %vars;
3083 3210
3084 my $eval = 3211 my $eval =
3085 "do {\n" 3212 "do {\n"
3086 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3087 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3088 . $code 3215 . $code
3089 . "\n}" 3216 . "\n}"
3090 ; 3217 ;
3091 3218
3219 if ($CFG{safe_eval}) {
3092 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3093 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3094 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3095 3228
3096 if ($@) { 3229 if ($@) {
3097 warn "$@"; 3230 warn "$@";
3098 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3099 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
3164 while (my ($face, $info) = each %$faces) { 3297 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3298 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166 3299
3167 cf::face::set_visibility $idx, $info->{visibility}; 3300 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap}; 3301 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3302 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3303 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3171 3304
3172 cf::cede_to_tick; 3305 cf::cede_to_tick;
3173 } 3306 }
3174 3307
3175 while (my ($face, $info) = each %$faces) { 3308 while (my ($face, $info) = each %$faces) {
3199 3332
3200 cf::anim::invalidate_all; # d'oh 3333 cf::anim::invalidate_all; # d'oh
3201 } 3334 }
3202 3335
3203 { 3336 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource}; 3337 my $res = $facedata->{resource};
3207 3338
3208 while (my ($name, $info) = each %$res) { 3339 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) { 3340 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3341 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212 3342
3213 if ($info->{type} & 1) { 3343 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type}; 3344 cf::face::set_type $idx, $info->{type};
3228 } else { 3345 } else {
3229 $RESOURCE{$name} = $info; 3346 $RESOURCE{$name} = $info;
3230 } 3347 }
3231 3348
3264 while (my ($k, $v) = each %$want) { 3381 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3382 $ns->fx_want ($k, $v);
3266 } 3383 }
3267}; 3384};
3268 3385
3386sub load_resource_file($) {
3387 my $guard = lock_acquire "load_resource_file";
3388
3389 my $status = load_resource_file_ $_[0];
3390 get_slot 0.1, 100;
3391 cf::arch::commit_load;
3392
3393 $status
3394}
3395
3269sub reload_regions { 3396sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3397 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3398 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3399 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3400
3286} 3413}
3287 3414
3288sub reload_archetypes { 3415sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3416 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3417 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3418}
3297 3419
3298sub reload_treasures { 3420sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3421 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3422 or die "unable to load treasurelists\n";
3301} 3423}
3302 3424
3303sub reload_resources { 3425sub reload_resources {
3304 warn "reloading resource files...\n"; 3426 warn "reloading resource files...\n";
3305 3427
3428 reload_facedata;
3429 reload_archetypes;
3306 reload_regions; 3430 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3431 reload_treasures;
3311 3432
3312 warn "finished reloading resource files\n"; 3433 warn "finished reloading resource files\n";
3313} 3434}
3314 3435
3315sub init {
3316 reload_resources;
3317}
3318
3319sub reload_config { 3436sub reload_config {
3437 warn "reloading config file...\n";
3438
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3439 open my $fh, "<:utf8", "$CONFDIR/config"
3321 or return; 3440 or return;
3322 3441
3323 local $/; 3442 local $/;
3324 *CFG = YAML::Load <$fh>; 3443 *CFG = YAML::XS::Load scalar <$fh>;
3325 3444
3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3445 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3327 3446
3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3447 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3448 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3333 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3452 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3334 and die "WARNING: m(un)lockall failed: $!\n"; 3453 and die "WARNING: m(un)lockall failed: $!\n";
3335 }; 3454 };
3336 warn $@ if $@; 3455 warn $@ if $@;
3337 } 3456 }
3457
3458 warn "finished reloading resource files\n";
3459}
3460
3461sub pidfile() {
3462 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3463 or die "$PIDFILE: $!";
3464 flock $fh, &Fcntl::LOCK_EX
3465 or die "$PIDFILE: flock: $!";
3466 $fh
3467}
3468
3469# make sure only one server instance is running at any one time
3470sub atomic {
3471 my $fh = pidfile;
3472
3473 my $pid = <$fh>;
3474 kill 9, $pid if $pid > 0;
3475
3476 seek $fh, 0, 0;
3477 print $fh $$;
3478}
3479
3480sub main_loop {
3481 warn "EV::loop starting\n";
3482 if (1) {
3483 EV::loop;
3484 }
3485 warn "EV::loop returned\n";
3486 goto &main_loop unless $REALLY_UNLOOP;
3338} 3487}
3339 3488
3340sub main { 3489sub main {
3490 cf::init_globals; # initialise logging
3491
3492 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3493 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3494 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3495 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3496
3497 cf::init_experience;
3498 cf::init_anim;
3499 cf::init_attackmess;
3500 cf::init_dynamic;
3501
3502 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3503
3341 # we must not ever block the main coroutine 3504 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3505 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3506 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3507 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3508 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3509 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3510 })->prio (Coro::PRIO_MAX);
3348 }; 3511 };
3349 3512
3513 evthread_start IO::AIO::poll_fileno;
3514
3515 cf::sync_job {
3516 cf::load_settings;
3517 cf::load_materials;
3518
3519 reload_resources;
3350 reload_config; 3520 reload_config;
3351 db_init; 3521 db_init;
3522
3523 cf::init_uuid;
3524 cf::init_signals;
3525 cf::init_commands;
3526 cf::init_skills;
3527
3528 cf::init_beforeplay;
3529
3530 atomic;
3531
3352 load_extensions; 3532 load_extensions;
3353 3533
3354 $TICK_WATCHER->start; 3534 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3535
3356 EV::loop; 3536 # no (long-running) fork's whatsoever before this point(!)
3537 use POSIX ();
3538 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3539
3540 (pop @POST_INIT)->(0) while @POST_INIT;
3541 };
3542
3543 main_loop;
3357} 3544}
3358 3545
3359############################################################################# 3546#############################################################################
3360# initialisation and cleanup 3547# initialisation and cleanup
3361 3548
3367 cf::cleanup "SIG$signal"; 3554 cf::cleanup "SIG$signal";
3368 }; 3555 };
3369 } 3556 }
3370} 3557}
3371 3558
3372sub write_runtime { 3559sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime";
3374
3375 # first touch the runtime file to show we are still running: 3560 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3561 # the fsync below can take a very very long time.
3377 3562
3378 IO::AIO::aio_utime $runtime, undef, undef; 3563 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3564
3380 my $guard = cf::lock_acquire "write_runtime"; 3565 my $guard = cf::lock_acquire "write_runtime";
3381 3566
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3567 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3383 or return; 3568 or return;
3384 3569
3385 my $value = $cf::RUNTIME + 90 + 10; 3570 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3571 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3572 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3582 aio_utime $fh, undef, undef;
3398 3583
3399 close $fh 3584 close $fh
3400 or return; 3585 or return;
3401 3586
3402 aio_rename "$runtime~", $runtime 3587 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3588 and return;
3404 3589
3405 warn "runtime file written.\n"; 3590 warn "runtime file written.\n";
3406 3591
3407 1 3592 1
3593}
3594
3595our $uuid_lock;
3596our $uuid_skip;
3597
3598sub write_uuid_sync($) {
3599 $uuid_skip ||= $_[0];
3600
3601 return if $uuid_lock;
3602 local $uuid_lock = 1;
3603
3604 my $uuid = "$LOCALDIR/uuid";
3605
3606 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3607 or return;
3608
3609 my $value = uuid_seq uuid_cur;
3610
3611 unless ($value) {
3612 warn "cowardly refusing to write zero uuid value!\n";
3613 return;
3614 }
3615
3616 my $value = uuid_str $value + $uuid_skip;
3617 $uuid_skip = 0;
3618
3619 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3620 and return;
3621
3622 # always fsync - this file is important
3623 aio_fsync $fh
3624 and return;
3625
3626 close $fh
3627 or return;
3628
3629 aio_rename "$uuid~", $uuid
3630 and return;
3631
3632 warn "uuid file written ($value).\n";
3633
3634 1
3635
3636}
3637
3638sub write_uuid($$) {
3639 my ($skip, $sync) = @_;
3640
3641 $sync ? write_uuid_sync $skip
3642 : async { write_uuid_sync $skip };
3408} 3643}
3409 3644
3410sub emergency_save() { 3645sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3646 my $freeze_guard = cf::freeze_mainloop;
3412 3647
3413 warn "enter emergency perl save\n"; 3648 warn "emergency_perl_save: enter\n";
3414 3649
3415 cf::sync_job { 3650 cf::sync_job {
3651 # this is a trade-off: we want to be very quick here, so
3652 # save all maps without fsync, and later call a global sync
3653 # (which in turn might be very very slow)
3654 local $USE_FSYNC = 0;
3655
3416 # use a peculiar iteration method to avoid tripping on perl 3656 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3657 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3658 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3659 warn "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3660 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3661 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3662 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3663 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3664 $pl->save;
3425 } 3665 }
3426 warn "end emergency player save\n"; 3666 warn "emergency_perl_save: end player save\n";
3427 3667
3428 warn "begin emergency map save\n"; 3668 warn "emergency_perl_save: begin map save\n";
3429 for my $path (keys %cf::MAP) { 3669 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3670 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3671 $map->valid or next;
3432 $map->save; 3672 $map->save;
3433 } 3673 }
3434 warn "end emergency map save\n"; 3674 warn "emergency_perl_save: end map save\n";
3435 3675
3436 warn "begin emergency database checkpoint\n"; 3676 warn "emergency_perl_save: begin database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3677 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3678 warn "emergency_perl_save: end database checkpoint\n";
3679
3680 warn "emergency_perl_save: begin write uuid\n";
3681 write_uuid_sync 1;
3682 warn "emergency_perl_save: end write uuid\n";
3439 }; 3683 };
3440 3684
3685 warn "emergency_perl_save: starting sync()\n";
3686 IO::AIO::aio_sync sub {
3687 warn "emergency_perl_save: finished sync()\n";
3688 };
3689
3441 warn "leave emergency perl save\n"; 3690 warn "emergency_perl_save: leave\n";
3442} 3691}
3443 3692
3444sub post_cleanup { 3693sub post_cleanup {
3445 my ($make_core) = @_; 3694 my ($make_core) = @_;
3446 3695
3447 warn Carp::longmess "post_cleanup backtrace" 3696 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3697 if $make_core;
3698
3699 my $fh = pidfile;
3700 unlink $PIDFILE if <$fh> == $$;
3701}
3702
3703# a safer delete_package, copied from Symbol
3704sub clear_package($) {
3705 my $pkg = shift;
3706
3707 # expand to full symbol table name if needed
3708 unless ($pkg =~ /^main::.*::$/) {
3709 $pkg = "main$pkg" if $pkg =~ /^::/;
3710 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3711 $pkg .= '::' unless $pkg =~ /::$/;
3712 }
3713
3714 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3715 my $stem_symtab = *{$stem}{HASH};
3716
3717 defined $stem_symtab and exists $stem_symtab->{$leaf}
3718 or return;
3719
3720 # clear all symbols
3721 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3722 for my $name (keys %$leaf_symtab) {
3723 _gv_clear *{"$pkg$name"};
3724# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3725 }
3726 warn "cleared package $pkg\n";#d#
3449} 3727}
3450 3728
3451sub do_reload_perl() { 3729sub do_reload_perl() {
3452 # can/must only be called in main 3730 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3731 if ($Coro::current != $Coro::main) {
3454 warn "can only reload from main coroutine"; 3732 warn "can only reload from main coroutine";
3455 return; 3733 return;
3456 } 3734 }
3457 3735
3736 return if $RELOAD++;
3737
3738 my $t1 = EV::time;
3739
3740 while ($RELOAD) {
3458 warn "reloading..."; 3741 warn "reloading...";
3459 3742
3460 warn "entering sync_job"; 3743 warn "entering sync_job";
3461 3744
3462 cf::sync_job { 3745 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3746 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3747 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3748 cf::write_runtime_sync; # external watchdog should not bark
3466 3749
3467 warn "syncing database to disk"; 3750 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3751 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3752
3470 # if anything goes wrong in here, we should simply crash as we already saved 3753 # if anything goes wrong in here, we should simply crash as we already saved
3471 3754
3472 warn "flushing outstanding aio requests"; 3755 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs; 3756 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3757 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = ();
3486
3487 warn "removing commands";
3488 %COMMAND = ();
3489
3490 warn "removing ext/exti commands";
3491 %EXTCMD = ();
3492 %EXTICMD = ();
3493
3494 warn "unloading/nuking all extensions";
3495 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg";
3497
3498 if (my $cb = $pkg->can ("unload")) {
3499 eval {
3500 $cb->($pkg);
3501 1
3502 } or warn "$pkg unloaded, but with errors: $@";
3503 } 3758 }
3504 3759
3505 warn "... nuking $pkg"; 3760 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3761 $_->cancel for values %EXT_CORO;
3507 } 3762 %EXT_CORO = ();
3508 3763
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3764 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3765 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3766
3767 warn "removing ext/exti commands";
3768 %EXTCMD = ();
3769 %EXTICMD = ();
3770
3771 warn "unloading/nuking all extensions";
3772 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3773 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3774
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3775 if (my $cb = $pkg->can ("unload")) {
3776 eval {
3520 $cb->(); 3777 $cb->($pkg);
3778 1
3779 } or warn "$pkg unloaded, but with errors: $@";
3780 }
3781
3782 warn "... clearing $pkg";
3783 clear_package $pkg;
3521 } 3784 }
3522 3785
3523 Symbol::delete_package $k; 3786 warn "unloading all perl modules loaded from $LIBDIR";
3787 while (my ($k, $v) = each %INC) {
3788 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3789
3790 warn "... unloading $k";
3791 delete $INC{$k};
3792
3793 $k =~ s/\.pm$//;
3794 $k =~ s/\//::/g;
3795
3796 if (my $cb = $k->can ("unload_module")) {
3797 $cb->();
3798 }
3799
3800 clear_package $k;
3524 } 3801 }
3525 3802
3526 warn "getting rid of safe::, as good as possible"; 3803 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3804 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3805 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3806
3530 warn "unloading cf.pm \"a bit\""; 3807 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3808 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3809 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3533 3810
3534 # don't, removes xs symbols, too, 3811 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3812 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3813 #clear_package __PACKAGE__;
3537 3814
3538 warn "unload completed, starting to reload now"; 3815 warn "unload completed, starting to reload now";
3539 3816
3540 warn "reloading cf.pm"; 3817 warn "reloading cf.pm";
3541 require cf; 3818 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3819 cf::_connect_to_perl_1;
3543 3820
3544 warn "loading config and database again"; 3821 warn "loading config and database again";
3545 cf::reload_config; 3822 cf::reload_config;
3546 3823
3547 warn "loading extensions"; 3824 warn "loading extensions";
3548 cf::load_extensions; 3825 cf::load_extensions;
3549 3826
3827 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 3828 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3829 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3830 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3831 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3832 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3833 reattach $_ for values %PLAYER;
3834 }
3556 3835
3836 warn "running post_init jobs";
3837 (pop @POST_INIT)->(1) while @POST_INIT;
3838
3557 warn "leaving sync_job"; 3839 warn "leaving sync_job";
3558 3840
3559 1 3841 1
3560 } or do { 3842 } or do {
3561 warn $@; 3843 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3844 cf::cleanup "error while reloading, exiting.";
3563 }; 3845 };
3564 3846
3565 warn "reloaded"; 3847 warn "reloaded";
3848 --$RELOAD;
3849 }
3850
3851 $t1 = EV::time - $t1;
3852 warn "reload completed in ${t1}s\n";
3566}; 3853};
3567 3854
3568our $RELOAD_WATCHER; # used only during reload 3855our $RELOAD_WATCHER; # used only during reload
3569 3856
3570sub reload_perl() { 3857sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 3858 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 3859 # coro crashes during coro_state_free->destroy here.
3573 3860
3861 $RELOAD_WATCHER ||= cf::async {
3862 Coro::AIO::aio_wait cache_extensions;
3863
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3864 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 3865 do_reload_perl;
3576 undef $RELOAD_WATCHER; 3866 undef $RELOAD_WATCHER;
3867 };
3577 }; 3868 };
3578} 3869}
3579 3870
3580register_command "reload" => sub { 3871register_command "reload" => sub {
3581 my ($who, $arg) = @_; 3872 my ($who, $arg) = @_;
3595 3886
3596our @WAIT_FOR_TICK; 3887our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3888our @WAIT_FOR_TICK_BEGIN;
3598 3889
3599sub wait_for_tick { 3890sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3891 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3602 3892
3603 my $signal = new Coro::Signal; 3893 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3894 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3895 $signal->wait;
3606} 3896}
3607 3897
3608sub wait_for_tick_begin { 3898sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3899 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3611 3900
3612 my $signal = new Coro::Signal; 3901 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3902 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3903 $signal->wait;
3615} 3904}
3616 3905
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3906sub tick {
3618 if ($Coro::current != $Coro::main) { 3907 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3908 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3909 unless ++$bug_warning > 10;
3621 return; 3910 return;
3622 } 3911 }
3623 3912
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3913 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3914
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3915 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3916 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3917 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3918 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3919 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3920 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3921 };
3638 } 3922 }
3639 3923
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3924 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3642 } 3926 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3927 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3928 $sig->send;
3645 } 3929 }
3646 3930
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3931 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3932 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3933
3650 _post_tick; 3934 if (0) {
3651}; 3935 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3936 my $jitter = $TICK_START - $NEXT_TICK;
3937 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3938 warn "jitter $JITTER\n";#d#
3939 }
3940 }
3941}
3653 3942
3654{ 3943{
3655 # configure BDB 3944 # configure BDB
3656 3945
3657 BDB::min_parallel 8; 3946 BDB::min_parallel 8;
3658 BDB::max_poll_reqs $TICK * 0.1; 3947 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3948 $AnyEvent::BDB::WATCHER->priority (1);
3660 3949
3661 unless ($DB_ENV) { 3950 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3951 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3952 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 3953 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3954 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3955 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3956 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 3957
3668 cf::sync_job { 3958 cf::sync_job {
3669 eval { 3959 eval {
3695{ 3985{
3696 # configure IO::AIO 3986 # configure IO::AIO
3697 3987
3698 IO::AIO::min_parallel 8; 3988 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 3989 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 3990 undef $AnyEvent::AIO::WATCHER;
3701} 3991}
3702 3992
3703my $_log_backtrace; 3993my $_log_backtrace;
3704 3994
3705sub _log_backtrace { 3995sub _log_backtrace {
3708 $msg =~ s/\n//; 3998 $msg =~ s/\n//;
3709 3999
3710 # limit the # of concurrent backtraces 4000 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 4001 if ($_log_backtrace < 2) {
3712 ++$_log_backtrace; 4002 ++$_log_backtrace;
4003 my $perl_bt = Carp::longmess $msg;
3713 async { 4004 async {
3714 $Coro::current->{desc} = "abt $msg"; 4005 $Coro::current->{desc} = "abt $msg";
3715 4006
3716 my @bt = fork_call { 4007 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 4008 @addr = map { sprintf "%x", $_ } @addr;
3728 } 4019 }
3729 4020
3730 @funcs 4021 @funcs
3731 }; 4022 };
3732 4023
3733 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $perl_bt\n";
4025 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 4026 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 4027 --$_log_backtrace;
3736 }; 4028 };
3737 } else { 4029 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 4030 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n"; 4031 LOG llevInfo, "[ABT] [suppressed]\n";
3740 } 4032 }
3741} 4033}
3742 4034
3743# load additional modules 4035# load additional modules
3744use cf::pod; 4036require "cf/$_.pm" for @EXTRA_MODULES;
4037cf::_connect_to_perl_2;
3745 4038
3746END { cf::emergency_save } 4039END { cf::emergency_save }
3747 4040
37481 40411
3749 4042

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines