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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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 Event; 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;
43use Coro::EV;
18use Coro::Event; 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$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 184
123############################################################################# 185#############################################################################
124 186
125=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
126 188
162 224
163The raw value load value from the last tick. 225The raw value load value from the last tick.
164 226
165=item %cf::CFG 227=item %cf::CFG
166 228
167Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 230from wherever your confdir points to.
169 231
170=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
171 233
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 237
176=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
177 239
178This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 242that call.
181 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
182=back 250=back
183 251
184=cut 252=cut
185 253
186BEGIN { 254$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 255 my $msg = join "", @_;
189 256
190 $msg .= "\n" 257 $msg .= "\n"
191 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
192 259
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 261
195 LOG llevError, $msg; 262 LOG llevError, $msg;
196 }; 263};
197} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
198 278
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 289for my $pkg (qw(
210 cf::global cf::attachable 290 cf::global cf::attachable
211 cf::object cf::object::player 291 cf::object cf::object::player
212 cf::client cf::player 292 cf::client cf::player
213 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
214 cf::map cf::party cf::region 295 cf::party cf::region
215)) { 296)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 298}
219 299
220$Event::DIED = sub { 300$EV::DIED = sub {
221 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
222}; 302};
223 303
224############################################################################# 304#############################################################################
225 305
226=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 329 $d
250 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
251} 331}
252 332
253=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
254 334
255Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
256 336
257=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
258 338
259Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
260 340
261=cut 341=cut
262 342
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 344
265sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
267 361
268=item cf::lock_wait $string 362=item cf::lock_wait $string
269 363
270Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
271 365
272=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
273 367
274Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
277returned. 371returned.
278 372
279Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 374deadlocked coro.
286 380
287Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
288 382
289=cut 383=cut
290 384
291our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 386
294sub lock_wait($) { 387sub lock_wait($) {
295 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 389}
308 390
309sub lock_acquire($) { 391sub lock_acquire($) {
310 my ($key) = @_; 392 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 393}
324 394
325sub lock_active($) { 395sub lock_active($) {
326 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 397}
330 398
331sub freeze_mainloop { 399sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
333 401
334 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 403}
336 }; 404
337 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
338 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
339} 418}
340 419
341=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
342 421
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 430
352=cut 431=cut
353 432
354our @SLOT_QUEUE; 433our @SLOT_QUEUE;
355our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
356 436
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
360 440
361 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
362 443
363 while () { 444 while () {
364 next_job: 445 next_job:
446
365 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 448
367 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 453 $job->[2]->send;
371 Coro::cede; 454 Coro::cede;
372 goto next_job; 455 goto next_job;
373 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 458 }
375 } 459 }
376 460
377 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 464 $signal->wait;
381 } else { 465 } else {
466 $busy = 0;
382 Coro::schedule; 467 Coro::schedule;
383 } 468 }
384 } 469 }
385}; 470};
386 471
387sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
388 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
389 476
390 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
391 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
392 480
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
406 494
407BEGIN { *async = \&Coro::async_pool } 495BEGIN { *async = \&Coro::async_pool }
408 496
409=item cf::sync_job { BLOCK } 497=item cf::sync_job { BLOCK }
410 498
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 499The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 500is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 501partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 502acceptable.
415 503
416If it must be done, put the blocking parts into C<sync_job>. This will run 504If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 505the given BLOCK in another coroutine while waiting for the result. The
422 510
423sub sync_job(&) { 511sub sync_job(&) {
424 my ($job) = @_; 512 my ($job) = @_;
425 513
426 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 515 my $time = AE::time;
428 516
429 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
431 519
432 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
433 521
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
437 523
438 my $busy = 1; 524 my $busy = 1;
439 my @res; 525 my @res;
440 526
447 533
448 while ($busy) { 534 while ($busy) {
449 if (Coro::nready) { 535 if (Coro::nready) {
450 Coro::cede_notself; 536 Coro::cede_notself;
451 } else { 537 } else {
452 Event::one_event; 538 EV::loop EV::LOOP_ONESHOT;
453 } 539 }
454 } 540 }
455 541
456 $time = Event::time - $time; 542 my $time = AE::time - $time;
457 543
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
462 545
463 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
464 } else { 547 } else {
465 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
466 549
491=item fork_call { }, $args 574=item fork_call { }, $args
492 575
493Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
497 580
498=cut 581=cut
499 582
500sub fork_call(&@) { 583sub fork_call(&@) {
501 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
508 reset_signals; 591 reset_signals;
509 &$cb 592 &$cb
510 }, @args; 593 }, @args;
511 594
512 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
513} 634}
514 635
515=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
516 637
517Returns a single value from the environment database. 638Returns a single value from the environment database.
656 777
657############################################################################# 778#############################################################################
658 779
659=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
660 781
661Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
664 785
665In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 788Deliantra).
668 789
669=over 4 790=over 4
670 791
671=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
672 793
716=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
717 838
718Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
720 841
721Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
723 844
724These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
725 846
726=over 4 847=over 4
954 } 1075 }
955 1076
956 0 1077 0
957} 1078}
958 1079
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1081
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1083
963Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
964 1085
1017 1138
1018sub reattach { 1139sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1141 my ($obj) = @_;
1021 1142
1143 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1145
1024 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1025 1147
1026 @$registry = (); 1148 @$registry = ();
1027 1149
1042cf::attachable->attach ( 1164cf::attachable->attach (
1043 prio => -1000000, 1165 prio => -1000000,
1044 on_instantiate => sub { 1166 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1046 1168
1047 $data = from_json $data; 1169 $data = decode_json $data;
1048 1170
1049 for (@$data) { 1171 for (@$data) {
1050 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1051 1173
1052 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1076 1198
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1081 close $fh; 1206 aio_close $fh;
1082 1207
1083 if (@$objs) { 1208 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1089 close $fh; 1217 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1219 }
1092 } else { 1220 } else {
1093 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1094 } 1222 }
1095 1223
1096 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1228 } else {
1098 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1099 } 1230 }
1100 } else { 1231 } else {
1101 aio_unlink $filename; 1232 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1103 } 1234 }
1194 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1195 1326
1196 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1197} 1328}
1198 1329
1330use File::Glob ();
1331
1199cf::player->attach ( 1332cf::player->attach (
1200 on_command => sub { 1333 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1202 1335
1203 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1204 or return; 1337 or return;
1205 1338
1235 1368
1236 cf::override; 1369 cf::override;
1237 }, 1370 },
1238); 1371);
1239 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1240sub load_extensions { 1386sub load_extensions {
1241 cf::sync_job { 1387 cf::sync_job {
1242 my %todo; 1388 my %todo;
1243 1389
1244 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1263 1409
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1412
1267 $ext{source} = 1413 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1270 . $source 1416 . $source
1271 . "\n};\n1"; 1417 . "\n};\n1";
1272 1418
1273 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1274 } 1420 }
1275 1421
1422 my $pass = 0;
1276 my %done; 1423 my %done;
1277 while (%todo) { 1424 while (%todo) {
1278 my $progress; 1425 my $progress;
1279 1426
1427 ++$pass;
1428
1429 ext:
1280 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1432 next ext
1283 unless exists $done{$_}; 1433 unless exists $done{$_};
1284 } 1434 }
1285 1435
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1437
1288 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1293 warn $msg; 1445
1294 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1447 delete $todo{$k};
1296 } 1448 } else {
1297 1449 $done{$k} = delete $todo{$k};
1298 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1299 } 1455 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1456 }
1305 1457
1306 skip: 1458 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1309 } 1466 }
1310 }; 1467 };
1311} 1468}
1312 1469
1313############################################################################# 1470#############################################################################
1314 1471
1315=back 1472=back
1316 1473
1317=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1318 1475
1319Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1320 1477
1321=cut 1478=cut
1322 1479
1323package cf::player; 1480package cf::player;
1324 1481
1367 1524
1368sub exists($) { 1525sub exists($) {
1369 my ($login) = @_; 1526 my ($login) = @_;
1370 1527
1371 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1373} 1530}
1374 1531
1375sub find($) { 1532sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1534 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1547 or return;
1391 1548
1392 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1393 or return; 1550 or return;
1551
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1397 } 1555 }
1398 } 1556 }
1399} 1557}
1400 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1401sub save($) { 1572sub save($) {
1402 my ($pl) = @_; 1573 my ($pl) = @_;
1403 1574
1404 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1405 1576
1408 1579
1409 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1410 1581
1411 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1589
1414 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1591 cf::cede_to_tick;
1416} 1592}
1417 1593
1449 my ($pl) = @_; 1625 my ($pl) = @_;
1450 1626
1451 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1452 1628
1453 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1631
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1460 1638
1461 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1679
1502 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1503 my $path = path $login; 1681 my $path = path $login;
1504 1682
1505 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1689 }
1511 1690
1515 1694
1516 \@logins 1695 \@logins
1517} 1696}
1518 1697
1519=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1520 1701
1521Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1522player. May block. 1703player. May block.
1523 1704
1524=cut 1705=cut
1542 } 1723 }
1543 1724
1544 \@paths 1725 \@paths
1545} 1726}
1546 1727
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1729
1549Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1731
1637=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1638 1733
1639Sends an ext reply to the player. 1734Sends an ext reply to the player.
1640 1735
1672 1767
1673=cut 1768=cut
1674 1769
1675sub find_by_path($) { 1770sub find_by_path($) {
1676 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1677 1774
1678 my ($match, $specificity); 1775 my ($match, $specificity);
1679 1776
1680 for my $region (list) { 1777 for my $region (list) {
1681 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1707our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1709 1806
1710sub generate_random_map { 1807sub generate_random_map {
1711 my ($self, $rmp) = @_; 1808 my ($self, $rmp) = @_;
1809
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811
1712 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1813 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1838 1938
1839# the temporary/swap location 1939# the temporary/swap location
1840sub save_path { 1940sub save_path {
1841 my ($self) = @_; 1941 my ($self) = @_;
1842 1942
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1845} 1945}
1846 1946
1847# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1848sub uniq_path { 1948sub uniq_path {
1849 my ($self) = @_; 1949 my ($self) = @_;
1850 1950
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 1953}
1863 1954
1864sub decay_objects { 1955sub decay_objects {
1865 my ($self) = @_; 1956 my ($self) = @_;
1866 1957
1950sub find { 2041sub find {
1951 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1952 2043
1953 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1954 2045
1955 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2048
1958 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1962 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1963 or return; 2051 or return;
1964 2052
1965 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1966 2054
1968 or return; 2056 or return;
1969 2057
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1973 undef $guard1; 2062 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 2063 $map->reset;
1976 return find $path; 2064 return find $path;
1977 } 2065 }
1978 2066
1979 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1980 } 2068 }
1981} 2069}
1982 2070
1983sub pre_load { } 2071sub pre_load { }
1984sub post_load { } 2072#sub post_load { } # XS
1985 2073
1986sub load { 2074sub load {
1987 my ($self) = @_; 2075 my ($self) = @_;
1988 2076
1989 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2095 $f->skip_block;
2008 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
2009 or return; 2097 or return;
2010 2098
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
2012 if delete $self->{load_original}; 2100 if delete $self->{load_original};
2013 2101
2014 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2103 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
2034 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2123 $self->decay_objects;
2036 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2037 $self->update_buttons; 2125 $self->update_buttons;
2038 cf::cede_to_tick; 2126 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2127 $self->activate;
2042 } 2128 }
2043 2129
2044 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2046 2132
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2134 }
2049 2135
2050 $self->post_load; 2136 $self->post_load;
2051} 2137}
2052 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2053sub customise_for { 2142sub customise_for {
2054 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2055 2144
2056 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2146 if $self->per_player;
2110 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2111 2200
2112 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2113 2202
2114 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2205 }
2117 2206
2118 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2119 2208
2120 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2135 2224
2136 () 2225 ()
2137} 2226}
2138 2227
2228# common code, used by both ->save and ->swapout
2139sub save { 2229sub _save {
2140 my ($self) = @_; 2230 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2231
2144 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2145 2233
2146 return unless $self->dirty; 2234 return unless $self->dirty;
2147 2235
2156 2244
2157 cf::async { 2245 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2160 }; 2248 };
2249
2250 cf::get_slot 0.02;
2161 2251
2162 if ($uniq) { 2252 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2255 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2257 }
2168} 2258}
2169 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2170sub swap_out { 2268sub swap_out {
2171 my ($self) = @_; 2269 my ($self) = @_;
2172 2270
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2178 return if $self->players; 2275 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2180 return if $self->{deny_save};
2181 2276
2182 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2183
2184 $self->deactivate; 2278 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2186 $self->clear; 2286 $self->clear;
2187} 2287}
2188 2288
2189sub reset_at { 2289sub reset_at {
2190 my ($self) = @_; 2290 my ($self) = @_;
2209 2309
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2311
2212 return if $self->players; 2312 return if $self->players;
2213 2313
2214 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2215 2315
2216 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2217 2317
2218 # need to save uniques path 2318 # need to save uniques path
2219 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2302 2402
2303sub unique_maps() { 2403sub unique_maps() {
2304 [ 2404 [
2305 map { 2405 map {
2306 utf8::decode $_; 2406 utf8::decode $_;
2307 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2308 ? normalise $_ 2410 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2412 ]
2312} 2413}
2313 2414
2314package cf; 2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2315 2446
2316=back 2447=back
2317 2448
2318=head3 cf::object 2449=head3 cf::object
2319 2450
2323 2454
2324=over 4 2455=over 4
2325 2456
2326=item $ob->inv_recursive 2457=item $ob->inv_recursive
2327 2458
2328Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2329 2461
2330=cut 2462=cut
2331 2463
2332sub inv_recursive_; 2464sub inv_recursive_;
2333sub inv_recursive_ { 2465sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2339} 2471}
2340 2472
2341=item $ref = $ob->ref 2473=item $ref = $ob->ref
2342 2474
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2475Creates and returns a persistent reference to an object that can be stored as a string.
2344 2476
2345=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2346 2478
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2480even if the object actually exists. May block.
2380can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2513dialogue with the given NPC character.
2382 2514
2383=cut 2515=cut
2384 2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2530
2385# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2532# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2548
2403 } else { 2549 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2552 }
2407 } 2553 }
2408} 2554}
2409 2555
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2581
2436=item $player_object->enter_link 2582=item $player_object->enter_link
2437 2583
2438Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2439 2585
2440The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2441I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2442 2590
2443Will never block. 2591Will never block.
2444 2592
2445=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2446 2594
2471 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2472 2620
2473 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2474 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2475 2623
2476 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2477} 2625}
2478 2626
2479sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2480 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2481 2629
2498 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2499 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2500 2648
2501 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2502 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2503 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2504 2652
2505 $map->load; 2653 $map->load;
2506 $map->load_neighbours; 2654 $map->load_neighbours;
2507 2655
2508 return unless $self->contr->active; 2656 return unless $self->contr->active;
2509 $self->activate_recursive;
2510 2657
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2513} 2663}
2514 2664
2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2516 2666
2517Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2669that has to return the map if sucecssful, and then unfreezes the player on
2520the new (success) or old (failed) map position. In either case, $done will 2670the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2671be called at the end of this process.
2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2522 2675
2523=cut 2676=cut
2524 2677
2525our $GOTOGEN; 2678our $GOTOGEN;
2526 2679
2605} 2758}
2606 2759
2607sub prepare_random_map { 2760sub prepare_random_map {
2608 my ($exit) = @_; 2761 my ($exit) = @_;
2609 2762
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2765 # that depends on the exit object
2615 2766
2616 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2769 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2623 } 2776 }
2624 2777
2625 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2626 2779
2627 my $data = cf::to_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2630 2783
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2786 undef $fh;
2634 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2635 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2638 } 2795 }
2639} 2796}
2640 2797
2641sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2643 2800
2644 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2645 2802
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2803 $self->enter_link;
2658 2804
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2805 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2806 $Coro::current->{desc} = "enter_exit";
2665 2807
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2668 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2669 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2670 1; 2829 1
2671 }) { 2830 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2835
2677 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2694sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2695 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2696 2855
2697 utf8::encode $text; 2856 utf8::encode $text;
2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2699} 2883}
2700 2884
2701=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2702 2886
2703Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2707 2891
2708=cut 2892=cut
2709 2893
2710# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2711our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2712 "c/identify" => { 2902 "c/identify" => {
2713 id => "infobox", 2903 id => "infobox",
2714 title => "Identify", 2904 title => "Identify",
2715 reply => undef, 2905 reply => undef,
2716 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2718 "c/examine" => { 2908 "c/examine" => {
2719 id => "infobox", 2909 id => "infobox",
2720 title => "Examine", 2910 title => "Examine",
2721 reply => undef, 2911 reply => undef,
2722 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2723 }, 2919 },
2724 "c/book" => { 2920 "c/book" => {
2725 id => "infobox", 2921 id => "infobox",
2726 title => "Book", 2922 title => "Book",
2727 reply => undef, 2923 reply => undef,
2743 id => "infobox", 2939 id => "infobox",
2744 title => "Body Parts", 2940 title => "Body Parts",
2745 reply => undef, 2941 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2747 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2748 "c/uptime" => { 2980 "c/uptime" => {
2749 id => "infobox", 2981 id => "infobox",
2750 title => "Uptime", 2982 title => "Uptime",
2751 reply => undef, 2983 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 2987 id => "infobox",
2756 title => "Map Info", 2988 title => "Map Info",
2757 reply => undef, 2989 reply => undef,
2758 tooltip => "Information related to the maps", 2990 tooltip => "Information related to the maps",
2759 }, 2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2760); 3006);
2761 3007
2762sub cf::client::send_msg { 3008sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2764 3010
2765 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2766 3013
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 3015
2769 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2772 3019
2773 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2777 3022
2778 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 3028 }
2785 3029
2786 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2787 } 3031 }
2788 3032
2789 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2790 3034
2791 if ($self->can_msg) {
2792 # default colour, mask it out 3035 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2795 3038
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 3042 );
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809 3043
2810 $color &= cf::NDI_COLOR_MASK; 3044 $self->send_big_packet ($pkt);
2811
2812 utf8::encode $msg;
2813
2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 }
2823} 3045}
2824 3046
2825=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2826 3048
2827Sends an ext event to the client. 3049Sends an ext event to the client.
2830 3052
2831sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2832 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2833 3055
2834 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2837 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 } 3061 }
2840} 3062}
2841 3063
2842=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2843 3065
2847 3069
2848sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2850 3072
2851 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove 3076 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 } 3079 }
2858} 3080}
2859 3081
2860=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2861 3083
2962 3184
2963 $coro 3185 $coro
2964} 3186}
2965 3187
2966cf::client->attach ( 3188cf::client->attach (
2967 on_destroy => sub { 3189 on_client_destroy => sub {
2968 my ($ns) = @_; 3190 my ($ns) = @_;
2969 3191
2970 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2971 }, 3193 },
2972); 3194);
2988our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
2989 3211
2990$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
2991 3213
2992$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
2994 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
2995 sort time 3217 sort time
2996)); 3218));
2997 3219
2998# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3001 3223
3002The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3003 3225
3004 cf::object 3226 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3228 insert remove name archname title slaying race decrease split
3229 value
3007 3230
3008 cf::object::player 3231 cf::object::player
3009 player 3232 player
3010 3233
3011 cf::player 3234 cf::player
3016 3239
3017=cut 3240=cut
3018 3241
3019for ( 3242for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3026) { 3249) {
3027 no strict 'refs'; 3250 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3047 3270
3048 my $qcode = $code; 3271 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3051 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3052 local $_; 3278 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars;
3054 3279
3055 my $eval = 3280 my $eval =
3056 "do {\n" 3281 "do {\n"
3057 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3058 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3059 . $code 3284 . $code
3060 . "\n}" 3285 . "\n}"
3061 ; 3286 ;
3062 3287
3288 if ($CFG{safe_eval}) {
3063 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3064 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3065 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3066 3297
3067 if ($@) { 3298 if ($@) {
3068 warn "$@"; 3299 warn "$@";
3069 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3070 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3089=cut 3320=cut
3090 3321
3091sub register_script_function { 3322sub register_script_function {
3092 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3093 3324
3094 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3095 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3096} 3327}
3097 3328
3098=back 3329=back
3099 3330
3100=cut 3331=cut
3121 3352
3122 $facedata->{version} == 2 3353 $facedata->{version} == 2
3123 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3124 3355
3125 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3126 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC, 3359 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3129 }; 3362 };
3130 cf::cede_to_tick; 3363 cf::cede_to_tick;
3131 3364
3132 { 3365 {
3133 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3134 3367
3135 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370
3137 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3141 3375
3142 cf::cede_to_tick; 3376 cf::cede_to_tick;
3143 } 3377 }
3144 3378
3145 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3380 next unless $info->{smooth};
3381
3147 my $idx = cf::face::find $face 3382 my $idx = cf::face::find $face
3148 or next; 3383 or next;
3384
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3385 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3386 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3388 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3389 warn "smooth face '$info->{smooth}' not found for face '$face'";
3167 3403
3168 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3169 } 3405 }
3170 3406
3171 { 3407 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3175 3409
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3411 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181 3413
3182 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3183 # prepend meta info 3415 cf::face::set_type $idx, $info->{type};
3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
3191 } else { 3416 } else {
3192 $data = $info->{data}; 3417 $RESOURCE{$name} = $info;
3193 } 3418 }
3194 3419
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3420 cf::cede_to_tick;
3199 } 3421 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3422 }
3423
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3425
3220 1 3426 1
3221} 3427}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3222 3448
3223register_exticmd fx_want => sub { 3449register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3450 my ($ns, $want) = @_;
3225 3451
3226 while (my ($k, $v) = each %$want) { 3452 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3453 $ns->fx_want ($k, $v);
3228 } 3454 }
3229}; 3455};
3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3230 3466
3231sub reload_regions { 3467sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3468 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3469 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3484}
3249 3485
3250sub reload_archetypes { 3486sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3488 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3489}
3259 3490
3260sub reload_treasures { 3491sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
3263} 3494}
3264 3495
3265sub reload_resources { 3496sub reload_resources {
3266 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
3267 3498
3499 reload_facedata;
3500 reload_archetypes;
3268 reload_regions; 3501 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3502 reload_treasures;
3273 3503
3274 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3275} 3505}
3276 3506
3277sub init {
3278 reload_resources;
3279}
3280
3281sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3511 or return;
3284 3512
3285 local $/; 3513 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3287 3515
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3517
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3295 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3296 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3297 }; 3525 };
3298 warn $@ if $@; 3526 warn $@ if $@;
3299 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3300} 3558}
3301 3559
3302sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3303 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3573 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3575 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3310 }; 3577 };
3311 3578
3579 evthread_start IO::AIO::poll_fileno;
3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3312 reload_config; 3591 reload_config;
3313 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3314 load_extensions; 3602 load_extensions;
3315 3603
3316 $TICK_WATCHER->start; 3604 utime time, time, $RUNTIMEFILE;
3317 Event::loop; 3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3318} 3617}
3319 3618
3320############################################################################# 3619#############################################################################
3321# initialisation and cleanup 3620# initialisation and cleanup
3322 3621
3323# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3324BEGIN { 3623BEGIN {
3624 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3333 },
3334 ); 3628 };
3335 } 3629 }
3336} 3630}
3337 3631
3338sub write_runtime { 3632sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3340 3634
3341 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3343 3637
3344 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3639
3346 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3347 3641
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3349 or return; 3643 or return;
3350 3644
3351 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3364 3658
3365 close $fh 3659 close $fh
3366 or return; 3660 or return;
3367 3661
3368 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3663 and return;
3370 3664
3371 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3372 3666
3373 1 3667 1
3668}
3669
3670our $uuid_lock;
3671our $uuid_skip;
3672
3673sub write_uuid_sync($) {
3674 $uuid_skip ||= $_[0];
3675
3676 return if $uuid_lock;
3677 local $uuid_lock = 1;
3678
3679 my $uuid = "$LOCALDIR/uuid";
3680
3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3682 or return;
3683
3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0;
3693
3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3695 and return;
3696
3697 # always fsync - this file is important
3698 aio_fsync $fh
3699 and return;
3700
3701 close $fh
3702 or return;
3703
3704 aio_rename "$uuid~", $uuid
3705 and return;
3706
3707 warn "uuid file written ($value).\n";
3708
3709 1
3710
3711}
3712
3713sub write_uuid($$) {
3714 my ($skip, $sync) = @_;
3715
3716 $sync ? write_uuid_sync $skip
3717 : async { write_uuid_sync $skip };
3374} 3718}
3375 3719
3376sub emergency_save() { 3720sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3378 3722
3379 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3380 3724
3381 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3382 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3737 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3739 $pl->save;
3391 } 3740 }
3392 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3393 3742
3394 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3746 $map->valid or next;
3398 $map->save; 3747 $map->save;
3399 } 3748 }
3400 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3401 3750
3402 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3754
3755 warn "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n";
3405 }; 3758 };
3406 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3407 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3408} 3766}
3409 3767
3410sub post_cleanup { 3768sub post_cleanup {
3411 my ($make_core) = @_; 3769 my ($make_core) = @_;
3412 3770
3413 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3415} 3801}
3416 3802
3417sub do_reload_perl() { 3803sub do_reload_perl() {
3418 # can/must only be called in main 3804 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3420 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3421 return; 3807 return;
3422 } 3808 }
3423 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3424 warn "reloading..."; 3815 warn "reloading...";
3425 3816
3426 warn "entering sync_job"; 3817 warn "entering sync_job";
3427 3818
3428 cf::sync_job { 3819 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3821 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3432 3823
3433 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3826
3436 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3437 3828
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3829 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3832 }
3475 3833
3476 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3478 } 3836 %EXT_CORO = ();
3479 3837
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3848
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3491 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3492 } 3858 }
3493 3859
3494 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3495 } 3875 }
3496 3876
3497 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3880
3501 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3884
3505 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3886 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3508 3888
3509 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3510 3890
3511 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3512 require cf; 3892 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3514 3894
3515 warn "loading config and database again"; 3895 warn "loading config and database again";
3516 cf::reload_config; 3896 cf::reload_config;
3517 3897
3518 warn "loading extensions"; 3898 warn "loading extensions";
3519 cf::load_extensions; 3899 cf::load_extensions;
3520 3900
3901 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3527 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3528 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3529 3914
3530 1 3915 1
3531 } or do { 3916 } or do {
3532 warn $@; 3917 warn $@;
3533 warn "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3919 };
3536 3920
3537 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3538}; 3927};
3539 3928
3540our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3541 3930
3542sub reload_perl() { 3931sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3545 3934
3546 $RELOAD_WATCHER ||= Event->timer ( 3935 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 3936 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 3937
3549 data => WF_AUTOCANCEL, 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 3939 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3553 }, 3941 };
3554 ); 3942 };
3555} 3943}
3556 3944
3557register_command "reload" => sub { 3945register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3559 3947
3572 3960
3573our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3575 3963
3576sub wait_for_tick { 3964sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3579 3966
3580 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3969 $signal->wait;
3583} 3970}
3584 3971
3585sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3588 3974
3589 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3977 $signal->wait;
3592} 3978}
3593 3979
3594$TICK_WATCHER = Event->timer ( 3980sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3981 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3604 return; 3984 return;
3605 } 3985 }
3606 3986
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3610 3988
3611 $RUNTIME += $TICK; 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3612 $NEXT_TICK += $TICK;
3613 3990
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3993 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3995 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3996 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3997 };
3998 }
3622 3999
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 4001 $sig->send;
3625 } 4002 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 4003 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 4004 $sig->send;
3628 } 4005 }
3629 4006
3630 $NOW = Event::time; 4007 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 4009
3641 _post_tick; 4010 if (0) {
4011 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d#
4015 }
3642 }, 4016 }
3643); 4017}
3644 4018
3645{ 4019{
4020 # configure BDB
4021
3646 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3647 BDB::max_poll_time $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 4024 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 4025
3672 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 4033
3679 cf::sync_job { 4034 cf::sync_job {
3680 eval { 4035 eval {
3690 4045
3691 cf::cleanup "db_env_open(db): $@" if $@; 4046 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 4047 };
3693 } 4048 }
3694 4049
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 4050 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4051 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 4052 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4053 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4054 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 4055 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 4056 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4057 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 4058 };
3725} 4059}
3726 4060
3727{ 4061{
4062 # configure IO::AIO
4063
3728 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 4066 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 4067}
3741 4068
3742my $_log_backtrace; 4069my $_log_backtrace;
3743 4070
3744sub _log_backtrace { 4071sub _log_backtrace {
3747 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3748 4075
3749 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3752 async { 4080 async {
3753 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3754 4082
3755 my @bt = fork_call { 4083 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3767 } 4095 }
3768 4096
3769 @funcs 4097 @funcs
3770 }; 4098 };
3771 4099
3772 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 4103 --$_log_backtrace;
3775 }; 4104 };
3776 } else { 4105 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3779 } 4108 }
3780} 4109}
3781 4110
3782# load additional modules 4111# load additional modules
3783use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3784 4114
3785END { cf::emergency_save } 4115END { cf::emergency_save }
3786 4116
37871 41171
3788 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines