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.401 by root, Mon Dec 17 06:45:53 2007 UTC vs.
Revision 1.488 by root, Wed Oct 21 00:44:39 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
14 37
38use Guard ();
15use Coro 4.32 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
18use Coro::EV; 42use Coro::EV;
43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
23use Coro::BDB; 50use Coro::BDB 1.6;
24use Coro::Storable; 51use Coro::Storable;
25use Coro::Util (); 52use Coro::Util ();
26 53
27use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
28use BDB (); 55use BDB ();
29use Data::Dumper; 56use Data::Dumper;
30use Digest::MD5; 57use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 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# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
74 112
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 115our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 121our $DB_ENV;
87 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
88our %CFG; 125our %CFG;
89 126
90our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 128our $RUNTIME;
92our $NOW; 129our $NOW;
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 137
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
103our $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 :)
104 147
105binmode STDOUT; 148binmode STDOUT;
106binmode STDERR; 149binmode STDERR;
107 150
108# read virtual server time, if available 151# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
113} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
114 159
115mkdir $_ 160mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 162
118our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
119 164
120sub 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::"} };
121 177
122############################################################################# 178#############################################################################
123 179
124=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
125 181
172returns 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
173per 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.
174 230
175=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
176 232
177This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 235that call.
180 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
181=back 243=back
182 244
183=cut 245=cut
184 246
185BEGIN { 247$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 248 my $msg = join "", @_;
188 249
189 $msg .= "\n" 250 $msg .= "\n"
190 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
191 252
192 $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;
193 254
194 LOG llevError, $msg; 255 LOG llevError, $msg;
195 }; 256};
196} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
197 271
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 282for my $pkg (qw(
209 cf::global cf::attachable 283 cf::global cf::attachable
210 cf::object cf::object::player 284 cf::object cf::object::player
211 cf::client cf::player 285 cf::client cf::player
212 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
213 cf::map cf::party cf::region 288 cf::party cf::region
214)) { 289)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 291}
218 292
219$EV::DIED = sub { 293$EV::DIED = sub {
220 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
262our $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
263 337
264sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
266 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
267=item cf::lock_wait $string 355=item cf::lock_wait $string
268 356
269Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
270 358
271=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
272 360
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
276returned. 364returned.
277 365
278Locks 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
279deadlocked coro. 367deadlocked coro.
285 373
286Return 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.
287 375
288=cut 376=cut
289 377
290our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 379
293sub lock_wait($) { 380sub lock_wait($) {
294 my ($key) = @_; 381 $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} 382}
307 383
308sub lock_acquire($) { 384sub lock_acquire($) {
309 my ($key) = @_; 385 $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} 386}
323 387
324sub lock_active($) { 388sub lock_active($) {
325 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 390}
329 391
330sub freeze_mainloop { 392sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
332 394
333 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 396}
339 397
340=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
341 399
342Like 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
397 } 455 }
398 } 456 }
399}; 457};
400 458
401sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
402 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
403 463
404 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
406 466
443 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
445 505
446 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
447 507
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
451 509
452 my $busy = 1; 510 my $busy = 1;
453 my @res; 511 my @res;
454 512
465 } else { 523 } else {
466 EV::loop EV::LOOP_ONESHOT; 524 EV::loop EV::LOOP_ONESHOT;
467 } 525 }
468 } 526 }
469 527
470 $time = EV::time - $time; 528 my $time = EV::time - $time;
471 529
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 530 $TICK_START += $time; # do not account sync jobs to server load
476 531
477 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
478 } else { 533 } else {
479 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
480 535
522 reset_signals; 577 reset_signals;
523 &$cb 578 &$cb
524 }, @args; 579 }, @args;
525 580
526 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
527} 609}
528 610
529=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
530 612
531Returns a single value from the environment database. 613Returns a single value from the environment database.
670 752
671############################################################################# 753#############################################################################
672 754
673=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
674 756
675Many 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
676attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
678 760
679In 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>
680C<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
730=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
731 813
732Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
734 816
735Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
736that 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.
737 819
738These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
739 821
740=over 4 822=over 4
968 } 1050 }
969 1051
970 0 1052 0
971} 1053}
972 1054
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1056
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1058
977Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
978 1060
1031 1113
1032sub reattach { 1114sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1116 my ($obj) = @_;
1035 1117
1118 # no longer needed after getting rid of delete_package?
1036 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
1037 1120
1038 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1039 1122
1040 @$registry = (); 1123 @$registry = ();
1041 1124
1087 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1090 1173
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 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 }
1095 close $fh; 1181 aio_close $fh;
1096 1182
1097 if (@$objs) { 1183 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1102 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 }
1103 close $fh; 1192 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1194 }
1106 } else { 1195 } else {
1107 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1108 } 1197 }
1109 1198
1110 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1203 } else {
1112 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1113 } 1205 }
1114 } else { 1206 } else {
1115 aio_unlink $filename; 1207 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1117 } 1209 }
1208 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1209 1301
1210 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1211} 1303}
1212 1304
1305use File::Glob ();
1306
1213cf::player->attach ( 1307cf::player->attach (
1214 on_command => sub { 1308 on_command => sub {
1215 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1216 1310
1217 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1249 1343
1250 cf::override; 1344 cf::override;
1251 }, 1345 },
1252); 1346);
1253 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
1254sub load_extensions { 1361sub load_extensions {
1255 cf::sync_job { 1362 cf::sync_job {
1256 my %todo; 1363 my %todo;
1257 1364
1258 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1277 1384
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1387
1281 $ext{source} = 1388 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1284 . $source 1391 . $source
1285 . "\n};\n1"; 1392 . "\n};\n1";
1286 1393
1287 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1303 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1305 1412
1306 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1414 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1416 }
1311 1417
1312 warn $msg; 1418 warn $msg;
1313 } 1419 }
1314 1420
1328 1434
1329=back 1435=back
1330 1436
1331=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1332 1438
1333Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1334 1440
1335=cut 1441=cut
1336 1442
1337package cf::player; 1443package cf::player;
1338 1444
1381 1487
1382sub exists($) { 1488sub exists($) {
1383 my ($login) = @_; 1489 my ($login) = @_;
1384 1490
1385 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1387} 1493}
1388 1494
1389sub find($) { 1495sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1497 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1510 or return;
1405 1511
1406 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1407 or return; 1513 or return;
1514
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1411 } 1518 }
1412 } 1519 }
1422 1529
1423 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1424 1531
1425 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1427 1536
1428 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1538 cf::cede_to_tick;
1430} 1539}
1431 1540
1463 my ($pl) = @_; 1572 my ($pl) = @_;
1464 1573
1465 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1466 1575
1467 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1468 $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
1469 1578
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1474 1585
1475 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1626
1516 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1517 my $path = path $login; 1628 my $path = path $login;
1518 1629
1519 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1636 }
1525 1637
1556 } 1668 }
1557 1669
1558 \@paths 1670 \@paths
1559} 1671}
1560 1672
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1674
1563Expand crossfire pod fragments into protocol xml. 1675Expand 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 1676
1654=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1655 1678
1656Sends an ext reply to the player. 1679Sends an ext reply to the player.
1657 1680
1724our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1726 1749
1727sub generate_random_map { 1750sub generate_random_map {
1728 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
1729 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1756 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1855 1881
1856# the temporary/swap location 1882# the temporary/swap location
1857sub save_path { 1883sub save_path {
1858 my ($self) = @_; 1884 my ($self) = @_;
1859 1885
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1862} 1888}
1863 1889
1864# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1865sub uniq_path { 1891sub uniq_path {
1866 my ($self) = @_; 1892 my ($self) = @_;
1867 1893
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1895 "$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} 1896}
1880 1897
1881sub decay_objects { 1898sub decay_objects {
1882 my ($self) = @_; 1899 my ($self) = @_;
1883 1900
1967sub find { 1984sub find {
1968 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1969 1986
1970 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1971 1988
1972 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1991
1975 $cf::MAP{$path} || do { 1992 $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 1993 my $map = new_from_path cf::map $path
1980 or return; 1994 or return;
1981 1995
1982 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1983 1997
1985 or return; 1999 or return;
1986 2000
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1990 undef $guard1; 2005 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2006 $map->reset;
1993 return find $path; 2007 return find $path;
1994 } 2008 }
1995 2009
1996 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2038 $f->skip_block;
2025 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2026 or return; 2040 or return;
2027 2041
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2029 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2030 2044
2031 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2046 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2066 $self->decay_objects;
2053 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2054 $self->update_buttons; 2068 $self->update_buttons;
2055 cf::cede_to_tick; 2069 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2070 $self->activate;
2059 } 2071 }
2060 2072
2061 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2063 2075
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2077 }
2066 2078
2067 $self->post_load; 2079 $self->post_load;
2068} 2080}
2069 2081
2127 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2128 2140
2129 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2130 2142
2131 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2145 }
2134 2146
2135 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2136 2148
2137 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2186 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2177 }; 2189 };
2178 2190
2191 cf::get_slot 0.02;
2192
2179 if ($uniq) { 2193 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2196 } else {
2183 $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);
2191 $self->save; 2205 $self->save;
2192 2206
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2208
2195 return if $self->players; 2209 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2198 2212
2199 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2200 2214
2201 $self->deactivate; 2215 $self->deactivate;
2226 2240
2227 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2242
2229 return if $self->players; 2243 return if $self->players;
2230 2244
2231 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2232 2246
2233 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2234 2248
2235 # need to save uniques path 2249 # need to save uniques path
2236 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2319 2333
2320sub unique_maps() { 2334sub unique_maps() {
2321 [ 2335 [
2322 map { 2336 map {
2323 utf8::decode $_; 2337 utf8::decode $_;
2324 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2325 ? normalise $_ 2341 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2343 ]
2329} 2344}
2330 2345
2331package cf;
2332
2333=back 2346=back
2334 2347
2335=head3 cf::object 2348=head3 cf::object
2336 2349
2337=cut 2350=cut
2340 2353
2341=over 4 2354=over 4
2342 2355
2343=item $ob->inv_recursive 2356=item $ob->inv_recursive
2344 2357
2345Returns the inventory of the object _and_ their inventories, recursively. 2358Returns the inventory of the object I<and> their inventories, recursively,
2359but I<not> the object itself.
2346 2360
2347=cut 2361=cut
2348 2362
2349sub inv_recursive_; 2363sub inv_recursive_;
2350sub inv_recursive_ { 2364sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2369 inv_recursive_ inv $_[0]
2356} 2370}
2357 2371
2358=item $ref = $ob->ref 2372=item $ref = $ob->ref
2359 2373
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2374Creates and returns a persistent reference to an object that can be stored as a string.
2361 2375
2362=item $ob = cf::object::deref ($refstring) 2376=item $ob = cf::object::deref ($refstring)
2363 2377
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2378returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2379even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2411can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2412dialogue with the given NPC character.
2399 2413
2400=cut 2414=cut
2401 2415
2416our $SAY_CHANNEL = {
2417 id => "say",
2418 title => "Map",
2419 reply => "say ",
2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2421};
2422
2423our $CHAT_CHANNEL = {
2424 id => "chat",
2425 title => "Chat",
2426 reply => "chat ",
2427 tooltip => "Player chat and shouts, global to the server.",
2428};
2429
2402# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2431# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2432#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2434 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2445 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2446 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2447
2420 } else { 2448 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2451 }
2424 } 2452 }
2425} 2453}
2426 2454
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2455=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2480
2453=item $player_object->enter_link 2481=item $player_object->enter_link
2454 2482
2455Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2456 2484
2457The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2459 2489
2460Will never block. 2490Will never block.
2461 2491
2462=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2463 2493
2521 2551
2522 $map->load; 2552 $map->load;
2523 $map->load_neighbours; 2553 $map->load_neighbours;
2524 2554
2525 return unless $self->contr->active; 2555 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2556
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2530} 2562}
2531 2563
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2565
2534Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2568that 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 2569the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2570be called at the end of this process.
2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2539 2574
2540=cut 2575=cut
2541 2576
2542our $GOTOGEN; 2577our $GOTOGEN;
2543 2578
2622} 2657}
2623 2658
2624sub prepare_random_map { 2659sub prepare_random_map {
2625 my ($exit) = @_; 2660 my ($exit) = @_;
2626 2661
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2664 # that depends on the exit object
2632 2665
2633 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2668 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2640 } 2675 }
2641 2676
2642 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2643 2678
2644 my $data = cf::encode_json $rmp; 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2680 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2681 my $meta = "$RANDOMDIR/$md5.meta";
2647 2682
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2685 undef $fh;
2651 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2652 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2655 } 2694 }
2656} 2695}
2657 2696
2658sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2660 2699
2661 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2662 2701
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; 2702 $self->enter_link;
2675 2703
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 { 2704 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2705 $Coro::current->{desc} = "enter_exit";
2682 2706
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2707 unless (eval {
2708 $self->deactivate_recursive; # just to be sure
2709
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2719 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp;
2721
2685 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2686 2723
2724 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y)
2726 if $exit->flag (cf::FLAG_DAMNED);
2727
2687 1; 2728 1
2688 }) { 2729 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2734
2694 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
2724 2765
2725=cut 2766=cut
2726 2767
2727# non-persistent channels (usually the info channel) 2768# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2729 "c/identify" => { 2776 "c/identify" => {
2730 id => "infobox", 2777 id => "infobox",
2731 title => "Identify", 2778 title => "Identify",
2732 reply => undef, 2779 reply => undef,
2733 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
2735 "c/examine" => { 2782 "c/examine" => {
2736 id => "infobox", 2783 id => "infobox",
2737 title => "Examine", 2784 title => "Examine",
2738 reply => undef, 2785 reply => undef,
2739 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2740 }, 2793 },
2741 "c/book" => { 2794 "c/book" => {
2742 id => "infobox", 2795 id => "infobox",
2743 title => "Book", 2796 title => "Book",
2744 reply => undef, 2797 reply => undef,
2760 id => "infobox", 2813 id => "infobox",
2761 title => "Body Parts", 2814 title => "Body Parts",
2762 reply => undef, 2815 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2816 tooltip => "Shows which body parts you posess and are available",
2764 }, 2817 },
2818 "c/statistics" => {
2819 id => "infobox",
2820 title => "Statistics",
2821 reply => undef,
2822 tooltip => "Shows your primary statistics",
2823 },
2824 "c/skills" => {
2825 id => "infobox",
2826 title => "Skills",
2827 reply => undef,
2828 tooltip => "Shows your experience per skill and item power",
2829 },
2830 "c/shopitems" => {
2831 id => "infobox",
2832 title => "Shop Items",
2833 reply => undef,
2834 tooltip => "Shows the items currently for sale in this shop",
2835 },
2836 "c/resistances" => {
2837 id => "infobox",
2838 title => "Resistances",
2839 reply => undef,
2840 tooltip => "Shows your resistances",
2841 },
2842 "c/pets" => {
2843 id => "infobox",
2844 title => "Pets",
2845 reply => undef,
2846 tooltip => "Shows information abotu your pets/a specific pet",
2847 },
2848 "c/perceiveself" => {
2849 id => "infobox",
2850 title => "Perceive Self",
2851 reply => undef,
2852 tooltip => "You gained detailed knowledge about yourself",
2853 },
2765 "c/uptime" => { 2854 "c/uptime" => {
2766 id => "infobox", 2855 id => "infobox",
2767 title => "Uptime", 2856 title => "Uptime",
2768 reply => undef, 2857 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2858 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2861 id => "infobox",
2773 title => "Map Info", 2862 title => "Map Info",
2774 reply => undef, 2863 reply => undef,
2775 tooltip => "Information related to the maps", 2864 tooltip => "Information related to the maps",
2776 }, 2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2872 "c/death" => {
2873 id => "death",
2874 title => "Death",
2875 reply => undef,
2876 tooltip => "Reason for and more info about your most recent death",
2877 },
2878 "c/say" => $SAY_CHANNEL,
2879 "c/chat" => $CHAT_CHANNEL,
2777); 2880);
2778 2881
2779sub cf::client::send_msg { 2882sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2883 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2884
2782 $msg = $self->pl->expand_cfpod ($msg); 2885 $msg = $self->pl->expand_cfpod ($msg)
2886 unless $color & cf::NDI_VERBATIM;
2783 2887
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2888 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2889
2786 # check predefined channels, for the benefit of C 2890 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2891 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2892 $channel = $CHANNEL{$channel};
2789 2893
2790 $self->ext_msg (channel_info => $channel) 2894 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2895 $channel = $channel->{id};
2794 2896
2795 } elsif (ref $channel) { 2897 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2898 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2899 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2900 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2901 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2902 }
2802 2903
2803 $channel = $channel->{id}; 2904 $channel = $channel->{id};
2804 } 2905 }
2805 2906
2806 return unless @extra || length $msg; 2907 return unless @extra || length $msg;
2807 2908
2808 if ($self->can_msg) {
2809 # default colour, mask it out 2909 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2910 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2911 if $color & cf::NDI_DEF;
2812 2912
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2913 my $pkt = "msg "
2914 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 2916 );
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 2917
2827 $color &= cf::NDI_COLOR_MASK; 2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2828 2921
2829 utf8::encode $msg; 2922 # split very large packets
2830 2923 if (8192 < length $pkt and $self->{can_lzf}) {
2831 if (0 && $msg =~ /\[/) { 2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2832 # COMMAND/INFO 2925 $pkt = "frag";
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 } 2926 }
2927
2928 $self->send_packet ($pkt);
2840} 2929}
2841 2930
2842=item $client->ext_msg ($type, @msg) 2931=item $client->ext_msg ($type, @msg)
2843 2932
2844Sends an ext event to the client. 2933Sends an ext event to the client.
3018 3107
3019The following functions and methods are available within a safe environment: 3108The following functions and methods are available within a safe environment:
3020 3109
3021 cf::object 3110 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3111 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3112 insert remove name archname title slaying race decrease split
3113 value
3024 3114
3025 cf::object::player 3115 cf::object::player
3026 player 3116 player
3027 3117
3028 cf::player 3118 cf::player
3033 3123
3034=cut 3124=cut
3035 3125
3036for ( 3126for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3129 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3043) { 3133) {
3044 no strict 'refs'; 3134 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3135 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 my ($code, %vars) = @_; 3153 my ($code, %vars) = @_;
3064 3154
3065 my $qcode = $code; 3155 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3157 $qcode =~ s/\n/\\n/g;
3158
3159 %vars = (_dummy => 0) unless %vars;
3068 3160
3069 local $_; 3161 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars; 3162 local @safe::cf::_safe_eval_args = values %vars;
3071 3163
3072 my $eval = 3164 my $eval =
3149 { 3241 {
3150 my $faces = $facedata->{faceinfo}; 3242 my $faces = $facedata->{faceinfo};
3151 3243
3152 while (my ($face, $info) = each %$faces) { 3244 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3245 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246
3154 cf::face::set_visibility $idx, $info->{visibility}; 3247 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3248 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3249 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}; 3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3251
3159 cf::cede_to_tick; 3252 cf::cede_to_tick;
3160 } 3253 }
3161 3254
3162 while (my ($face, $info) = each %$faces) { 3255 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3256 next unless $info->{smooth};
3257
3164 my $idx = cf::face::find $face 3258 my $idx = cf::face::find $face
3165 or next; 3259 or next;
3260
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3261 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3262 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3263 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3264 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3265 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3283 {
3189 # TODO: for gcfclient pleasure, we should give resources 3284 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3285 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3286 my $res = $facedata->{resource};
3192 3287
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3288 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3290 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3291 my $data;
3198 3292
3199 if ($info->{type} & 1) { 3293 if ($info->{type} & 1) {
3200 # prepend meta info 3294 # prepend meta info
3201 3295
3202 my $meta = $enc->encode ({ 3296 my $meta = $enc->encode ({
3203 name => $name, 3297 name => $name,
3204 %{ $info->{meta} || {} }, 3298 %{ $info->{meta} || {} },
3205 }); 3299 });
3206 3300
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3301 $data = pack "(w/a*)*", $meta, $info->{data};
3302 } else {
3303 $data = $info->{data};
3304 }
3305
3306 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307 cf::face::set_type $idx, $info->{type};
3208 } else { 3308 } else {
3209 $data = $info->{data}; 3309 $RESOURCE{$name} = $info;
3210 } 3310 }
3211 3311
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; 3312 cf::cede_to_tick;
3216 } 3313 }
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 } 3314 }
3315
3316 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3317
3237 1 3318 1
3238} 3319}
3320
3321cf::global->attach (on_resource_update => sub {
3322 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3323 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3324
3325 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3326 my $sound = $soundconf->{compat}[$_]
3327 or next;
3328
3329 my $face = cf::face::find "sound/$sound->[1]";
3330 cf::sound::set $sound->[0] => $face;
3331 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3332 }
3333
3334 while (my ($k, $v) = each %{$soundconf->{event}}) {
3335 my $face = cf::face::find "sound/$v";
3336 cf::sound::set $k => $face;
3337 }
3338 }
3339});
3239 3340
3240register_exticmd fx_want => sub { 3341register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3342 my ($ns, $want) = @_;
3242 3343
3243 while (my ($k, $v) = each %$want) { 3344 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3345 $ns->fx_want ($k, $v);
3245 } 3346 }
3246}; 3347};
3348
3349sub load_resource_file($) {
3350 my $guard = lock_acquire "load_resource_file";
3351
3352 my $status = load_resource_file_ $_[0];
3353 get_slot 0.1, 100;
3354 cf::arch::commit_load;
3355
3356 $status
3357}
3247 3358
3248sub reload_regions { 3359sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3360 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3361 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3362 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3376}
3266 3377
3267sub reload_archetypes { 3378sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3379 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3380 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} 3381}
3276 3382
3277sub reload_treasures { 3383sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3384 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3385 or die "unable to load treasurelists\n";
3280} 3386}
3281 3387
3282sub reload_resources { 3388sub reload_resources {
3283 warn "reloading resource files...\n"; 3389 warn "reloading resource files...\n";
3284 3390
3391 reload_facedata;
3392 reload_archetypes;
3285 reload_regions; 3393 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3394 reload_treasures;
3290 3395
3291 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3292} 3397}
3293 3398
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3403 or return;
3301 3404
3302 local $/; 3405 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3304 3407
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3409
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $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}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3417 };
3315 warn $@ if $@; 3418 warn $@ if $@;
3316 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3422}
3423
3424sub pidfile() {
3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3426 or die "$PIDFILE: $!";
3427 flock $fh, &Fcntl::LOCK_EX
3428 or die "$PIDFILE: flock: $!";
3429 $fh
3430}
3431
3432# make sure only one server instance is running at any one time
3433sub atomic {
3434 my $fh = pidfile;
3435
3436 my $pid = <$fh>;
3437 kill 9, $pid if $pid > 0;
3438
3439 seek $fh, 0, 0;
3440 print $fh $$;
3441}
3442
3443sub main_loop {
3444 warn "EV::loop starting\n";
3445 if (1) {
3446 EV::loop;
3447 }
3448 warn "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP;
3317} 3450}
3318 3451
3319sub main { 3452sub main {
3453 cf::init_globals; # initialise logging
3454
3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459
3460 cf::init_experience;
3461 cf::init_anim;
3462 cf::init_attackmess;
3463 cf::init_dynamic;
3464
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466
3320 # we must not ever block the main coroutine 3467 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3468 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3469 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3470 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3471 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3472 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3473 })->prio (Coro::PRIO_MAX);
3327 }; 3474 };
3328 3475
3476 evthread_start IO::AIO::poll_fileno;
3477
3478 cf::sync_job {
3479 reload_resources;
3329 reload_config; 3480 reload_config;
3330 db_init; 3481 db_init;
3482
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid;
3486 cf::init_signals;
3487 cf::init_commands;
3488 cf::init_skills;
3489
3490 cf::init_beforeplay;
3491
3492 atomic;
3493
3331 load_extensions; 3494 load_extensions;
3332 3495
3333 $TICK_WATCHER->start; 3496 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3497
3335 EV::loop; 3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501
3502 (pop @POST_INIT)->(0) while @POST_INIT;
3503 };
3504
3505 main_loop;
3336} 3506}
3337 3507
3338############################################################################# 3508#############################################################################
3339# initialisation and cleanup 3509# initialisation and cleanup
3340 3510
3346 cf::cleanup "SIG$signal"; 3516 cf::cleanup "SIG$signal";
3347 }; 3517 };
3348 } 3518 }
3349} 3519}
3350 3520
3351sub write_runtime { 3521sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3522 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3523 # the fsync below can take a very very long time.
3356 3524
3357 IO::AIO::aio_utime $runtime, undef, undef; 3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3526
3359 my $guard = cf::lock_acquire "write_runtime"; 3527 my $guard = cf::lock_acquire "write_runtime";
3360 3528
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3530 or return;
3363 3531
3364 my $value = $cf::RUNTIME + 90 + 10; 3532 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3533 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3534 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3544 aio_utime $fh, undef, undef;
3377 3545
3378 close $fh 3546 close $fh
3379 or return; 3547 or return;
3380 3548
3381 aio_rename "$runtime~", $runtime 3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3550 and return;
3383 3551
3384 warn "runtime file written.\n"; 3552 warn "runtime file written.\n";
3385 3553
3386 1 3554 1
3555}
3556
3557our $uuid_lock;
3558our $uuid_skip;
3559
3560sub write_uuid_sync($) {
3561 $uuid_skip ||= $_[0];
3562
3563 return if $uuid_lock;
3564 local $uuid_lock = 1;
3565
3566 my $uuid = "$LOCALDIR/uuid";
3567
3568 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3569 or return;
3570
3571 my $value = uuid_seq uuid_cur;
3572
3573 unless ($value) {
3574 warn "cowardly refusing to write zero uuid value!\n";
3575 return;
3576 }
3577
3578 my $value = uuid_str $value + $uuid_skip;
3579 $uuid_skip = 0;
3580
3581 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3582 and return;
3583
3584 # always fsync - this file is important
3585 aio_fsync $fh
3586 and return;
3587
3588 close $fh
3589 or return;
3590
3591 aio_rename "$uuid~", $uuid
3592 and return;
3593
3594 warn "uuid file written ($value).\n";
3595
3596 1
3597
3598}
3599
3600sub write_uuid($$) {
3601 my ($skip, $sync) = @_;
3602
3603 $sync ? write_uuid_sync $skip
3604 : async { write_uuid_sync $skip };
3387} 3605}
3388 3606
3389sub emergency_save() { 3607sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3608 my $freeze_guard = cf::freeze_mainloop;
3391 3609
3392 warn "enter emergency perl save\n"; 3610 warn "emergency_perl_save: enter\n";
3393 3611
3394 cf::sync_job { 3612 cf::sync_job {
3613 # this is a trade-off: we want to be very quick here, so
3614 # save all maps without fsync, and later call a global sync
3615 # (which in turn might be very very slow)
3616 local $USE_FSYNC = 0;
3617
3395 # use a peculiar iteration method to avoid tripping on perl 3618 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3619 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3620 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3621 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3622 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3623 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3624 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3625 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3626 $pl->save;
3404 } 3627 }
3405 warn "end emergency player save\n"; 3628 warn "emergency_perl_save: end player save\n";
3406 3629
3407 warn "begin emergency map save\n"; 3630 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3631 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3632 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3633 $map->valid or next;
3411 $map->save; 3634 $map->save;
3412 } 3635 }
3413 warn "end emergency map save\n"; 3636 warn "emergency_perl_save: end map save\n";
3414 3637
3415 warn "begin emergency database checkpoint\n"; 3638 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3639 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3640 warn "emergency_perl_save: end database checkpoint\n";
3641
3642 warn "emergency_perl_save: begin write uuid\n";
3643 write_uuid_sync 1;
3644 warn "emergency_perl_save: end write uuid\n";
3418 }; 3645 };
3419 3646
3647 warn "emergency_perl_save: starting sync()\n";
3648 IO::AIO::aio_sync sub {
3649 warn "emergency_perl_save: finished sync()\n";
3650 };
3651
3420 warn "leave emergency perl save\n"; 3652 warn "emergency_perl_save: leave\n";
3421} 3653}
3422 3654
3423sub post_cleanup { 3655sub post_cleanup {
3424 my ($make_core) = @_; 3656 my ($make_core) = @_;
3425 3657
3426 warn Carp::longmess "post_cleanup backtrace" 3658 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3659 if $make_core;
3660
3661 my $fh = pidfile;
3662 unlink $PIDFILE if <$fh> == $$;
3663}
3664
3665# a safer delete_package, copied from Symbol
3666sub clear_package($) {
3667 my $pkg = shift;
3668
3669 # expand to full symbol table name if needed
3670 unless ($pkg =~ /^main::.*::$/) {
3671 $pkg = "main$pkg" if $pkg =~ /^::/;
3672 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3673 $pkg .= '::' unless $pkg =~ /::$/;
3674 }
3675
3676 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3677 my $stem_symtab = *{$stem}{HASH};
3678
3679 defined $stem_symtab and exists $stem_symtab->{$leaf}
3680 or return;
3681
3682 # clear all symbols
3683 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684 for my $name (keys %$leaf_symtab) {
3685 _gv_clear *{"$pkg$name"};
3686# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687 }
3688 warn "cleared package $pkg\n";#d#
3428} 3689}
3429 3690
3430sub do_reload_perl() { 3691sub do_reload_perl() {
3431 # can/must only be called in main 3692 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3693 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3694 warn "can only reload from main coroutine";
3434 return; 3695 return;
3435 } 3696 }
3436 3697
3698 return if $RELOAD++;
3699
3700 my $t1 = EV::time;
3701
3702 while ($RELOAD) {
3437 warn "reloading..."; 3703 warn "reloading...";
3438 3704
3439 warn "entering sync_job"; 3705 warn "entering sync_job";
3440 3706
3441 cf::sync_job { 3707 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3708 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3709 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3710 cf::write_runtime_sync; # external watchdog should not bark
3445 3711
3446 warn "syncing database to disk"; 3712 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3713 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3714
3449 # if anything goes wrong in here, we should simply crash as we already saved 3715 # if anything goes wrong in here, we should simply crash as we already saved
3450 3716
3451 warn "flushing outstanding aio requests"; 3717 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; 3718 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3719 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 } 3720 }
3483 3721
3484 warn "... nuking $pkg"; 3722 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3723 $_->cancel for values %EXT_CORO;
3486 } 3724 %EXT_CORO = ();
3487 3725
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3726 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3727 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3728
3729 warn "removing ext/exti commands";
3730 %EXTCMD = ();
3731 %EXTICMD = ();
3732
3733 warn "unloading/nuking all extensions";
3734 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3735 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3736
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3737 if (my $cb = $pkg->can ("unload")) {
3738 eval {
3499 $cb->(); 3739 $cb->($pkg);
3740 1
3741 } or warn "$pkg unloaded, but with errors: $@";
3742 }
3743
3744 warn "... clearing $pkg";
3745 clear_package $pkg;
3500 } 3746 }
3501 3747
3502 Symbol::delete_package $k; 3748 warn "unloading all perl modules loaded from $LIBDIR";
3749 while (my ($k, $v) = each %INC) {
3750 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3751
3752 warn "... unloading $k";
3753 delete $INC{$k};
3754
3755 $k =~ s/\.pm$//;
3756 $k =~ s/\//::/g;
3757
3758 if (my $cb = $k->can ("unload_module")) {
3759 $cb->();
3760 }
3761
3762 clear_package $k;
3503 } 3763 }
3504 3764
3505 warn "getting rid of safe::, as good as possible"; 3765 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3766 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3768
3509 warn "unloading cf.pm \"a bit\""; 3769 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3770 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3772
3513 # don't, removes xs symbols, too, 3773 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3774 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3775 #clear_package __PACKAGE__;
3516 3776
3517 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3518 3778
3519 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3520 require cf; 3780 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3522 3782
3523 warn "loading config and database again"; 3783 warn "loading config and database again";
3524 cf::reload_config; 3784 cf::reload_config;
3525 3785
3526 warn "loading extensions"; 3786 warn "loading extensions";
3527 cf::load_extensions; 3787 cf::load_extensions;
3528 3788
3789 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3790 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3791 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3792 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3793 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3794 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3795 reattach $_ for values %PLAYER;
3796 }
3535 3797
3798 warn "running post_init jobs";
3799 (pop @POST_INIT)->(1) while @POST_INIT;
3800
3536 warn "leaving sync_job"; 3801 warn "leaving sync_job";
3537 3802
3538 1 3803 1
3539 } or do { 3804 } or do {
3540 warn $@; 3805 warn $@;
3541 warn "error while reloading, exiting."; 3806 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3807 };
3544 3808
3545 warn "reloaded"; 3809 warn "reloaded";
3810 --$RELOAD;
3811 }
3812
3813 $t1 = EV::time - $t1;
3814 warn "reload completed in ${t1}s\n";
3546}; 3815};
3547 3816
3548our $RELOAD_WATCHER; # used only during reload 3817our $RELOAD_WATCHER; # used only during reload
3549 3818
3550sub reload_perl() { 3819sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3820 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3821 # coro crashes during coro_state_free->destroy here.
3553 3822
3823 $RELOAD_WATCHER ||= cf::async {
3824 Coro::AIO::aio_wait cache_extensions;
3825
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3827 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3828 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3829 };
3557 }; 3830 };
3558} 3831}
3559 3832
3560register_command "reload" => sub { 3833register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3834 my ($who, $arg) = @_;
3575 3848
3576our @WAIT_FOR_TICK; 3849our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3850our @WAIT_FOR_TICK_BEGIN;
3578 3851
3579sub wait_for_tick { 3852sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3853 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3854
3583 my $signal = new Coro::Signal; 3855 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3856 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3857 $signal->wait;
3586} 3858}
3587 3859
3588sub wait_for_tick_begin { 3860sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3861 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3862
3592 my $signal = new Coro::Signal; 3863 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3864 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3865 $signal->wait;
3595} 3866}
3596 3867
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3868sub tick {
3598 if ($Coro::current != $Coro::main) { 3869 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3870 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3871 unless ++$bug_warning > 10;
3601 return; 3872 return;
3602 } 3873 }
3603 3874
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3875 cf::server_tick; # one server iteration
3607 3876
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3877 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 3878 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3879 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3880 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3881 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3882 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3883 };
3618 } 3884 }
3619 3885
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3886 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3888 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3889 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3890 $sig->send;
3625 } 3891 }
3626 3892
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3893 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3894 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3895
3630 _post_tick; 3896 if (0) {
3631}; 3897 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3898 my $jitter = $TICK_START - $NEXT_TICK;
3899 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3900 warn "jitter $JITTER\n";#d#
3901 }
3902 }
3903}
3633 3904
3634{ 3905{
3635 # configure BDB 3906 # configure BDB
3636 3907
3637 BDB::min_parallel 8; 3908 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3909 BDB::max_poll_reqs $TICK * 0.1;
3910 $AnyEvent::BDB::WATCHER->priority (1);
3639 3911
3640 unless ($DB_ENV) { 3912 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 3913 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3914 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643 | BDB::LOG_AUTOREMOVE, 1); 3915 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3916 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3917 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3918 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646 3919
3647 cf::sync_job { 3920 cf::sync_job {
3648 eval { 3921 eval {
3674{ 3947{
3675 # configure IO::AIO 3948 # configure IO::AIO
3676 3949
3677 IO::AIO::min_parallel 8; 3950 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 3951 IO::AIO::max_poll_time $TICK * 0.1;
3952 undef $AnyEvent::AIO::WATCHER;
3679} 3953}
3680 3954
3681my $_log_backtrace; 3955my $_log_backtrace;
3682 3956
3683sub _log_backtrace { 3957sub _log_backtrace {
3686 $msg =~ s/\n//; 3960 $msg =~ s/\n//;
3687 3961
3688 # limit the # of concurrent backtraces 3962 # limit the # of concurrent backtraces
3689 if ($_log_backtrace < 2) { 3963 if ($_log_backtrace < 2) {
3690 ++$_log_backtrace; 3964 ++$_log_backtrace;
3965 my $perl_bt = Carp::longmess $msg;
3691 async { 3966 async {
3692 $Coro::current->{desc} = "abt $msg"; 3967 $Coro::current->{desc} = "abt $msg";
3693 3968
3694 my @bt = fork_call { 3969 my @bt = fork_call {
3695 @addr = map { sprintf "%x", $_ } @addr; 3970 @addr = map { sprintf "%x", $_ } @addr;
3706 } 3981 }
3707 3982
3708 @funcs 3983 @funcs
3709 }; 3984 };
3710 3985
3711 LOG llevInfo, "[ABT] $msg\n"; 3986 LOG llevInfo, "[ABT] $perl_bt\n";
3987 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712 LOG llevInfo, "[ABT] $_\n" for @bt; 3988 LOG llevInfo, "[ABT] $_\n" for @bt;
3713 --$_log_backtrace; 3989 --$_log_backtrace;
3714 }; 3990 };
3715 } else { 3991 } else {
3716 LOG llevInfo, "[ABT] $msg\n"; 3992 LOG llevInfo, "[ABT] $msg\n";
3717 LOG llevInfo, "[ABT] [suppressed]\n"; 3993 LOG llevInfo, "[ABT] [suppressed]\n";
3718 } 3994 }
3719} 3995}
3720 3996
3721# load additional modules 3997# load additional modules
3722use cf::pod; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3723 4000
3724END { cf::emergency_save } 4001END { cf::emergency_save }
3725 4002
37261 40031
3727 4004

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines