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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
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
74our %RESOURCE; 111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
82 117
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 121our $DB_ENV;
88 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
89our %CFG; 125our %CFG;
90 126
91our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 128our $RUNTIME;
93our $NOW; 129our $NOW;
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $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 :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub 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::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
173returns 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
174per 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.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 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
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $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;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197}
198 257
199$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
200 warn Carp::longmess $_[0]; 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
201 Coro::terminate; 269 Coro::terminate
202}; 270};
203 271
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 282for my $pkg (qw(
215 cf::global cf::attachable 283 cf::global cf::attachable
216 cf::object cf::object::player 284 cf::object cf::object::player
217 cf::client cf::player 285 cf::client cf::player
218 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
219 cf::map cf::party cf::region 288 cf::party cf::region
220)) { 289)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 291}
224 292
225$EV::DIED = sub { 293$EV::DIED = sub {
226 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
227}; 295};
228 296
229############################################################################# 297#############################################################################
230 298
231=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
268our $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
269 337
270sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
272 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
273=item cf::lock_wait $string 355=item cf::lock_wait $string
274 356
275Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
276 358
277=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
278 360
279Wait 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
280a 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,
281for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
282returned. 364returned.
283 365
284Locks 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
285deadlocked coro. 367deadlocked coro.
291 373
292Return 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.
293 375
294=cut 376=cut
295 377
296our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 379
299sub lock_wait($) { 380sub lock_wait($) {
300 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 382}
313 383
314sub lock_acquire($) { 384sub lock_acquire($) {
315 my ($key) = @_; 385 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 386}
329 387
330sub lock_active($) { 388sub lock_active($) {
331 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 390}
335 391
336sub freeze_mainloop { 392sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
338 394
339 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 396}
345 397
346=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
347 399
348Like 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
403 } 455 }
404 } 456 }
405}; 457};
406 458
407sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
408 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
409 463
410 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
412 466
449 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
451 505
452 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
453 507
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
457 509
458 my $busy = 1; 510 my $busy = 1;
459 my @res; 511 my @res;
460 512
471 } else { 523 } else {
472 EV::loop EV::LOOP_ONESHOT; 524 EV::loop EV::LOOP_ONESHOT;
473 } 525 }
474 } 526 }
475 527
476 $time = EV::time - $time; 528 my $time = EV::time - $time;
477 529
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
482 531
483 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
484 } else { 533 } else {
485 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
486 535
528 reset_signals; 577 reset_signals;
529 &$cb 578 &$cb
530 }, @args; 579 }, @args;
531 580
532 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
533} 609}
534 610
535=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
536 612
537Returns a single value from the environment database. 613Returns a single value from the environment database.
676 752
677############################################################################# 753#############################################################################
678 754
679=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
680 756
681Many 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
682attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
684 760
685In 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>
686C<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
736=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
737 813
738Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
740 816
741Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
742that 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.
743 819
744These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
745 821
746=over 4 822=over 4
1037 1113
1038sub reattach { 1114sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1116 my ($obj) = @_;
1041 1117
1118 # no longer needed after getting rid of delete_package?
1042 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
1043 1120
1044 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1045 1122
1046 @$registry = (); 1123 @$registry = ();
1047 1124
1093 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1096 1173
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 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 }
1101 close $fh; 1181 aio_close $fh;
1102 1182
1103 if (@$objs) { 1183 if (@$objs) {
1104 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) {
1105 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1108 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 }
1109 close $fh; 1192 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1194 }
1112 } else { 1195 } else {
1113 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1114 } 1197 }
1115 1198
1116 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1203 } else {
1118 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1119 } 1205 }
1120 } else { 1206 } else {
1121 aio_unlink $filename; 1207 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1123 } 1209 }
1214 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1215 1301
1216 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1217} 1303}
1218 1304
1305use File::Glob ();
1306
1219cf::player->attach ( 1307cf::player->attach (
1220 on_command => sub { 1308 on_command => sub {
1221 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1222 1310
1223 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1255 1343
1256 cf::override; 1344 cf::override;
1257 }, 1345 },
1258); 1346);
1259 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
1260sub load_extensions { 1361sub load_extensions {
1261 cf::sync_job { 1362 cf::sync_job {
1262 my %todo; 1363 my %todo;
1263 1364
1264 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1283 1384
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1387
1287 $ext{source} = 1388 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1290 . $source 1391 . $source
1291 . "\n};\n1"; 1392 . "\n};\n1";
1292 1393
1293 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1309 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1311 1412
1312 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1414 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1416 }
1317 1417
1318 warn $msg; 1418 warn $msg;
1319 } 1419 }
1320 1420
1334 1434
1335=back 1435=back
1336 1436
1337=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1338 1438
1339Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1340 1440
1341=cut 1441=cut
1342 1442
1343package cf::player; 1443package cf::player;
1344 1444
1387 1487
1388sub exists($) { 1488sub exists($) {
1389 my ($login) = @_; 1489 my ($login) = @_;
1390 1490
1391 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1393} 1493}
1394 1494
1395sub find($) { 1495sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1497 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1510 or return;
1411 1511
1412 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1413 or return; 1513 or return;
1514
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1417 } 1518 }
1418 } 1519 }
1428 1529
1429 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1430 1531
1431 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1433 1536
1434 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1538 cf::cede_to_tick;
1436} 1539}
1437 1540
1469 my ($pl) = @_; 1572 my ($pl) = @_;
1470 1573
1471 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1472 1575
1473 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1474 $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
1475 1578
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1480 1585
1481 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1521 1626
1522 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1523 my $path = path $login; 1628 my $path = path $login;
1524 1629
1525 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1636 }
1531 1637
1562 } 1668 }
1563 1669
1564 \@paths 1670 \@paths
1565} 1671}
1566 1672
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1674
1569Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1676
1660=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1661 1678
1662Sends an ext reply to the player. 1679Sends an ext reply to the player.
1663 1680
1730our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1732 1749
1733sub generate_random_map { 1750sub generate_random_map {
1734 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
1735 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1756 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1861 1881
1862# the temporary/swap location 1882# the temporary/swap location
1863sub save_path { 1883sub save_path {
1864 my ($self) = @_; 1884 my ($self) = @_;
1865 1885
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1868} 1888}
1869 1889
1870# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1871sub uniq_path { 1891sub uniq_path {
1872 my ($self) = @_; 1892 my ($self) = @_;
1873 1893
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 1896}
1886 1897
1887sub decay_objects { 1898sub decay_objects {
1888 my ($self) = @_; 1899 my ($self) = @_;
1889 1900
1973sub find { 1984sub find {
1974 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1975 1986
1976 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1977 1988
1978 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1980 1991
1981 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1986 or return; 1994 or return;
1987 1995
1988 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1989 1997
1991 or return; 1999 or return;
1992 2000
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1996 undef $guard1; 2005 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2006 $map->reset;
1999 return find $path; 2007 return find $path;
2000 } 2008 }
2001 2009
2002 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2038 $f->skip_block;
2031 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2032 or return; 2040 or return;
2033 2041
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2035 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2036 2044
2037 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2046 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2066 $self->decay_objects;
2059 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2060 $self->update_buttons; 2068 $self->update_buttons;
2061 cf::cede_to_tick; 2069 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2070 $self->activate;
2065 } 2071 }
2066 2072
2067 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2069 2075
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2077 }
2072 2078
2073 $self->post_load; 2079 $self->post_load;
2074} 2080}
2075 2081
2133 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2134 2140
2135 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2136 2142
2137 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2145 }
2140 2146
2141 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2142 2148
2143 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2180 cf::async { 2186 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2183 }; 2189 };
2184 2190
2191 cf::get_slot 0.02;
2192
2185 if ($uniq) { 2193 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2196 } else {
2189 $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);
2197 $self->save; 2205 $self->save;
2198 2206
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2208
2201 return if $self->players; 2209 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2204 2212
2205 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2206 2214
2207 $self->deactivate; 2215 $self->deactivate;
2232 2240
2233 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234 2242
2235 return if $self->players; 2243 return if $self->players;
2236 2244
2237 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2238 2246
2239 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2240 2248
2241 # need to save uniques path 2249 # need to save uniques path
2242 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2325 2333
2326sub unique_maps() { 2334sub unique_maps() {
2327 [ 2335 [
2328 map { 2336 map {
2329 utf8::decode $_; 2337 utf8::decode $_;
2330 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2331 ? normalise $_ 2341 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2343 ]
2335} 2344}
2336 2345
2337package 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}
2338 2377
2339=back 2378=back
2340 2379
2341=head3 cf::object 2380=head3 cf::object
2342 2381
2346 2385
2347=over 4 2386=over 4
2348 2387
2349=item $ob->inv_recursive 2388=item $ob->inv_recursive
2350 2389
2351Returns 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.
2352 2392
2353=cut 2393=cut
2354 2394
2355sub inv_recursive_; 2395sub inv_recursive_;
2356sub inv_recursive_ { 2396sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2362} 2402}
2363 2403
2364=item $ref = $ob->ref 2404=item $ref = $ob->ref
2365 2405
2366creates 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.
2367 2407
2368=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2369 2409
2370returns 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,
2371even if the object actually exists. May block. 2411even if the object actually exists. May block.
2403can 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
2404dialogue with the given NPC character. 2444dialogue with the given NPC character.
2405 2445
2406=cut 2446=cut
2407 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
2408# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2463# with dialog boxes.
2410#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
2411sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2424 $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));
2425 2479
2426 } else { 2480 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2483 }
2430 } 2484 }
2431} 2485}
2432 2486
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2512
2459=item $player_object->enter_link 2513=item $player_object->enter_link
2460 2514
2461Freezes 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}>).
2462 2516
2463The 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.
2464I<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.
2465 2521
2466Will never block. 2522Will never block.
2467 2523
2468=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2469 2525
2521 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2523 2579
2524 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2527 2583
2528 $map->load; 2584 $map->load;
2529 $map->load_neighbours; 2585 $map->load_neighbours;
2530 2586
2531 return unless $self->contr->active; 2587 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2588
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $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;
2536} 2594}
2537 2595
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2539 2597
2540Moves 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
2541her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2542that 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
2543the 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
2544be 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 >>.
2545 2606
2546=cut 2607=cut
2547 2608
2548our $GOTOGEN; 2609our $GOTOGEN;
2549 2610
2628} 2689}
2629 2690
2630sub prepare_random_map { 2691sub prepare_random_map {
2631 my ($exit) = @_; 2692 my ($exit) = @_;
2632 2693
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2696 # that depends on the exit object
2638 2697
2639 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2700 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2646 } 2707 }
2647 2708
2648 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2649 2710
2650 my $data = cf::encode_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2653 2714
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2717 undef $fh;
2657 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2658 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2661 } 2726 }
2662} 2727}
2663 2728
2664sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2666 2731
2667 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2668 2733
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2734 $self->enter_link;
2681 2735
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2736 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2737 $Coro::current->{desc} = "enter_exit";
2688 2738
2689 $self->deactivate_recursive; # just to be sure
2690 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
2691 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2692 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
2693 1; 2760 1
2694 }) { 2761 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "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. "
2697 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2766
2700 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2717sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2719 2786
2720 utf8::encode $text; 2787 utf8::encode $text;
2721 $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);
2722} 2814}
2723 2815
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2817
2726Send 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
2730 2822
2731=cut 2823=cut
2732 2824
2733# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2735 "c/identify" => { 2833 "c/identify" => {
2736 id => "infobox", 2834 id => "infobox",
2737 title => "Identify", 2835 title => "Identify",
2738 reply => undef, 2836 reply => undef,
2739 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2741 "c/examine" => { 2839 "c/examine" => {
2742 id => "infobox", 2840 id => "infobox",
2743 title => "Examine", 2841 title => "Examine",
2744 reply => undef, 2842 reply => undef,
2745 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",
2746 }, 2850 },
2747 "c/book" => { 2851 "c/book" => {
2748 id => "infobox", 2852 id => "infobox",
2749 title => "Book", 2853 title => "Book",
2750 reply => undef, 2854 reply => undef,
2766 id => "infobox", 2870 id => "infobox",
2767 title => "Body Parts", 2871 title => "Body Parts",
2768 reply => undef, 2872 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2770 }, 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 },
2771 "c/uptime" => { 2911 "c/uptime" => {
2772 id => "infobox", 2912 id => "infobox",
2773 title => "Uptime", 2913 title => "Uptime",
2774 reply => undef, 2914 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 2918 id => "infobox",
2779 title => "Map Info", 2919 title => "Map Info",
2780 reply => undef, 2920 reply => undef,
2781 tooltip => "Information related to the maps", 2921 tooltip => "Information related to the maps",
2782 }, 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,
2783); 2937);
2784 2938
2785sub cf::client::send_msg { 2939sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2787 2941
2788 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2789 2944
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 2946
2792 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2795 2950
2796 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2800 2953
2801 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 2959 }
2808 2960
2809 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2810 } 2962 }
2811 2963
2812 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2813 2965
2814 if ($self->can_msg) {
2815 # default colour, mask it out 2966 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2818 2969
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 2973 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 2974
2833 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 2976}
2847 2977
2848=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2849 2979
2850Sends an ext event to the client. 2980Sends an ext event to the client.
2853 2983
2854sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2856 2986
2857 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 2992 }
2863} 2993}
2864 2994
2865=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2866 2996
2870 3000
2871sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2873 3003
2874 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3007 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3010 }
2881} 3011}
2882 3012
2883=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2884 3014
3024 3154
3025The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3026 3156
3027 cf::object 3157 cf::object
3028 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
3029 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
3030 3161
3031 cf::object::player 3162 cf::object::player
3032 player 3163 player
3033 3164
3034 cf::player 3165 cf::player
3039 3170
3040=cut 3171=cut
3041 3172
3042for ( 3173for (
3043 ["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
3044 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3049) { 3180) {
3050 no strict 'refs'; 3181 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3069 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3070 3201
3071 my $qcode = $code; 3202 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3074 3207
3075 local $_; 3208 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3077 3210
3078 my $eval = 3211 my $eval =
3158 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3293
3161 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3165 3298
3166 cf::cede_to_tick; 3299 cf::cede_to_tick;
3167 } 3300 }
3168 3301
3169 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
3193 3326
3194 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3195 } 3328 }
3196 3329
3197 { 3330 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3201 3332
3202 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3336
3207 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3222 } else { 3339 } else {
3223 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3224 } 3341 }
3225 3342
3258 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
3260 } 3377 }
3261}; 3378};
3262 3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3389
3263sub reload_regions { 3390sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3391 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3392 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3394
3280} 3407}
3281 3408
3282sub reload_archetypes { 3409sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3412}
3291 3413
3292sub reload_treasures { 3414sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
3295} 3417}
3296 3418
3297sub reload_resources { 3419sub reload_resources {
3298 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
3299 3421
3422 reload_facedata;
3423 reload_archetypes;
3300 reload_regions; 3424 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3425 reload_treasures;
3305 3426
3306 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3307} 3428}
3308 3429
3309sub init {
3310 reload_resources;
3311}
3312
3313sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3434 or return;
3316 3435
3317 local $/; 3436 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3319 3438
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3440
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3328 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3329 }; 3448 };
3330 warn $@ if $@; 3449 warn $@ if $@;
3331 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3332} 3481}
3333 3482
3334sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3335 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3501 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3342 }; 3505 };
3343 3506
3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3344 reload_config; 3514 reload_config;
3345 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3346 load_extensions; 3526 load_extensions;
3347 3527
3348 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3529
3350 EV::loop; 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3351} 3538}
3352 3539
3353############################################################################# 3540#############################################################################
3354# initialisation and cleanup 3541# initialisation and cleanup
3355 3542
3361 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
3362 }; 3549 };
3363 } 3550 }
3364} 3551}
3365 3552
3366sub write_runtime { 3553sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime";
3368
3369 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3371 3556
3372 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3558
3374 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3375 3560
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3377 or return; 3562 or return;
3378 3563
3379 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3392 3577
3393 close $fh 3578 close $fh
3394 or return; 3579 or return;
3395 3580
3396 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3582 and return;
3398 3583
3399 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3400 3585
3401 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
3402} 3637}
3403 3638
3404sub emergency_save() { 3639sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3406 3641
3407 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3408 3643
3409 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3410 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3656 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3658 $pl->save;
3419 } 3659 }
3420 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3421 3661
3422 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3665 $map->valid or next;
3426 $map->save; 3666 $map->save;
3427 } 3667 }
3428 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3429 3669
3430 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
3433 }; 3677 };
3434 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3435 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3436} 3685}
3437 3686
3438sub post_cleanup { 3687sub post_cleanup {
3439 my ($make_core) = @_; 3688 my ($make_core) = @_;
3440 3689
3441 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3443} 3721}
3444 3722
3445sub do_reload_perl() { 3723sub do_reload_perl() {
3446 # can/must only be called in main 3724 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3448 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3449 return; 3727 return;
3450 } 3728 }
3451 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3452 warn "reloading..."; 3735 warn "reloading...";
3453 3736
3454 warn "entering sync_job"; 3737 warn "entering sync_job";
3455 3738
3456 cf::sync_job { 3739 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3741 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3460 3743
3461 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3746
3464 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3465 3748
3466 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3752 }
3498 3753
3499 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3501 } 3756 %EXT_CORO = ();
3502 3757
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3768
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3514 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3515 } 3778 }
3516 3779
3517 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3518 } 3795 }
3519 3796
3520 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3800
3524 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3804
3528 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3806 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3531 3808
3532 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3533 3810
3534 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3535 require cf; 3812 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3537 3814
3538 warn "loading config and database again"; 3815 warn "loading config and database again";
3539 cf::reload_config; 3816 cf::reload_config;
3540 3817
3541 warn "loading extensions"; 3818 warn "loading extensions";
3542 cf::load_extensions; 3819 cf::load_extensions;
3543 3820
3821 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3550 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3551 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3552 3834
3553 1 3835 1
3554 } or do { 3836 } or do {
3555 warn $@; 3837 warn $@;
3556 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3839 };
3559 3840
3560 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3561}; 3847};
3562 3848
3563our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3564 3850
3565sub reload_perl() { 3851sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3568 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3571 do_reload_perl; 3861 };
3572 }; 3862 };
3573} 3863}
3574 3864
3575register_command "reload" => sub { 3865register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3590 3880
3591our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3593 3883
3594sub wait_for_tick { 3884sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3886
3598 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3889 $signal->wait;
3601} 3890}
3602 3891
3603sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3894
3607 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3897 $signal->wait;
3610} 3898}
3611 3899
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3900sub tick {
3613 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3616 return; 3904 return;
3617 } 3905 }
3618 3906
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3908
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 3911 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3912 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3913 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3914 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3915 };
3633 } 3916 }
3634 3917
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3637 } 3920 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3922 $sig->send;
3640 } 3923 }
3641 3924
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3927
3645 _post_tick; 3928 if (0) {
3646}; 3929 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 3930 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d#
3933 }
3934 }
3935}
3648 3936
3649{ 3937{
3650 # configure BDB 3938 # configure BDB
3651 3939
3652 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3653 BDB::max_poll_reqs $TICK * 0.1; 3941 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 3942 $AnyEvent::BDB::WATCHER->priority (1);
3655 3943
3656 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 3951
3663 cf::sync_job { 3952 cf::sync_job {
3664 eval { 3953 eval {
3690{ 3979{
3691 # configure IO::AIO 3980 # configure IO::AIO
3692 3981
3693 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 3984 undef $AnyEvent::AIO::WATCHER;
3696} 3985}
3697 3986
3698my $_log_backtrace; 3987my $_log_backtrace;
3699 3988
3700sub _log_backtrace { 3989sub _log_backtrace {
3703 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3704 3993
3705 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3708 async { 3998 async {
3709 $Coro::current->{desc} = "abt $msg"; 3999 $Coro::current->{desc} = "abt $msg";
3710 4000
3711 my @bt = fork_call { 4001 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4013 }
3724 4014
3725 @funcs 4015 @funcs
3726 }; 4016 };
3727 4017
3728 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4021 --$_log_backtrace;
3731 }; 4022 };
3732 } else { 4023 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3735 } 4026 }
3736} 4027}
3737 4028
3738# load additional modules 4029# load additional modules
3739use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3740 4032
3741END { cf::emergency_save } 4033END { cf::emergency_save }
3742 4034
37431 40351
3744 4036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines