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.396 by root, Wed Nov 14 08:09:46 2007 UTC vs.
Revision 1.499 by root, Sun Jan 10 17:43:46 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines