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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 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 Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 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.32 (); 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;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These 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 228returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
226=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 367deadlocked coro.
286 373
287Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $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} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $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} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 423
352=cut 424=cut
353 425
354our @SLOT_QUEUE; 426our @SLOT_QUEUE;
355our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
356 429
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
359 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
360 436
361 while () { 437 while () {
362 next_job: 438 next_job:
439
363 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 441
365 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 446 $job->[2]->send;
369 Coro::cede; 447 Coro::cede;
370 goto next_job; 448 goto next_job;
371 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 451 }
373 } 452 }
374 453
375 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 457 $signal->wait;
379 } else { 458 } else {
459 $busy = 0;
380 Coro::schedule; 460 Coro::schedule;
381 } 461 }
382 } 462 }
383}; 463};
384 464
385sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
386 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
387 469
388 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
389 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
390 473
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
404 487
405BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
406 489
407=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
408 491
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 495acceptable.
413 496
414If it must be done, put the blocking parts into C<sync_job>. This will run 497If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
420 503
421sub sync_job(&) { 504sub sync_job(&) {
422 my ($job) = @_; 505 my ($job) = @_;
423 506
424 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 508 my $time = EV::time;
426 509
427 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
429 512
430 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 514
432 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
433 516
434 my $busy = 1; 517 my $busy = 1;
435 my @res; 518 my @res;
436 519
437 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 522 @res = eval { $job->() };
439 warn $@ if $@; 523 warn $@ if $@;
440 undef $busy; 524 undef $busy;
441 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
442 526
443 while ($busy) { 527 while ($busy) {
444 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
445 } 532 }
533 }
446 534
447 $time = Event::time - $time; 535 my $time = EV::time - $time;
448 536
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
453 538
454 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
455 } else { 540 } else {
456 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
457 542
482=item fork_call { }, $args 567=item fork_call { }, $args
483 568
484Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
488 573
489=cut 574=cut
490 575
491sub fork_call(&@) { 576sub fork_call(&@) {
492 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
499 reset_signals; 584 reset_signals;
500 &$cb 585 &$cb
501 }, @args; 586 }, @args;
502 587
503 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
504} 616}
505 617
506=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
507 619
508Returns a single value from the environment database. 620Returns a single value from the environment database.
647 759
648############################################################################# 760#############################################################################
649 761
650=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
651 763
652Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
655 767
656In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 770Deliantra).
659 771
660=over 4 772=over 4
661 773
662=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
663 775
707=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
708 820
709Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
711 823
712Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
714 826
715These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
716 828
717=over 4 829=over 4
945 } 1057 }
946 1058
947 0 1059 0
948} 1060}
949 1061
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1063
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1065
954Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
955 1067
961 1073
962=cut 1074=cut
963 1075
964############################################################################# 1076#############################################################################
965# object support 1077# object support
966#
967 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
968sub _can_merge { 1112sub _can_merge {
969 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
970 1114
971 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1116
975 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
976} 1119}
977 1120
978sub reattach { 1121sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1123 my ($obj) = @_;
981 1124
1125 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1127
984 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
985 1129
986 @$registry = (); 1130 @$registry = ();
987 1131
1002cf::attachable->attach ( 1146cf::attachable->attach (
1003 prio => -1000000, 1147 prio => -1000000,
1004 on_instantiate => sub { 1148 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1006 1150
1007 $data = from_json $data; 1151 $data = decode_json $data;
1008 1152
1009 for (@$data) { 1153 for (@$data) {
1010 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1011 1155
1012 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1025 }, 1169 },
1026); 1170);
1027 1171
1028sub object_freezer_save { 1172sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1174
1033 sync_job { 1175 sync_job {
1034 if (length $$rdata) { 1176 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1038 1180
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1043 close $fh; 1188 aio_close $fh;
1044 1189
1045 if (@$objs) { 1190 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1051 close $fh; 1199 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1201 }
1054 } else { 1202 } else {
1055 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1056 } 1204 }
1057 1205
1058 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1059 } else { 1210 } else {
1060 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1061 } 1212 }
1062 } else { 1213 } else {
1063 aio_unlink $filename; 1214 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1065 } 1216 }
1066 }; 1217 };
1067
1068 undef $guard;
1069} 1218}
1070 1219
1071sub object_freezer_as_string { 1220sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1073 1222
1078 1227
1079sub object_thawer_load { 1228sub object_thawer_load {
1080 my ($filename) = @_; 1229 my ($filename) = @_;
1081 1230
1082 my ($data, $av); 1231 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1232
1086 (aio_load $filename, $data) >= 0 1233 (aio_load $filename, $data) >= 0
1087 or return; 1234 or return;
1088 1235
1089 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1238 or return;
1092 1239
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1095 } 1242 }
1096 1243
1097 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1160 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1161 1308
1162 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1163} 1310}
1164 1311
1312use File::Glob ();
1313
1165cf::player->attach ( 1314cf::player->attach (
1166 on_command => sub { 1315 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1168 1317
1169 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1170 or return; 1319 or return;
1171 1320
1201 1350
1202 cf::override; 1351 cf::override;
1203 }, 1352 },
1204); 1353);
1205 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1206sub load_extensions { 1368sub load_extensions {
1207 cf::sync_job { 1369 cf::sync_job {
1208 my %todo; 1370 my %todo;
1209 1371
1210 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1229 1391
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1394
1233 $ext{source} = 1395 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1236 . $source 1398 . $source
1237 . "\n};\n1"; 1399 . "\n};\n1";
1238 1400
1239 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1240 } 1402 }
1241 1403
1404 my $pass = 0;
1242 my %done; 1405 my %done;
1243 while (%todo) { 1406 while (%todo) {
1244 my $progress; 1407 my $progress;
1245 1408
1409 ++$pass;
1410
1411 ext:
1246 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1414 next ext
1249 unless exists $done{$_}; 1415 unless exists $done{$_};
1250 } 1416 }
1251 1417
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1419
1254 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n";
1257 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1259 warn $msg; 1427 } else {
1260 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1261 exit 1; 1429 push @EXTS, $v->{pkg};
1262 } 1430 $progress = 1;
1263 1431
1264 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1265 } 1434 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1435 }
1271 1436
1272 skip: 1437 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1275 } 1445 }
1276 }; 1446 };
1277} 1447}
1278 1448
1279############################################################################# 1449#############################################################################
1280 1450
1281=back 1451=back
1282 1452
1283=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1284 1454
1285Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1286 1456
1287=cut 1457=cut
1288 1458
1289package cf::player; 1459package cf::player;
1290 1460
1333 1503
1334sub exists($) { 1504sub exists($) {
1335 my ($login) = @_; 1505 my ($login) = @_;
1336 1506
1337 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1339} 1509}
1340 1510
1341sub find($) { 1511sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1513 my $login = $_[0];
1355 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1526 or return;
1357 1527
1358 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1359 or return; 1529 or return;
1530
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1363 } 1534 }
1364 } 1535 }
1374 1545
1375 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1376 1547
1377 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1550
1551 cf::get_slot 0.01;
1379 1552
1380 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1554 cf::cede_to_tick;
1382} 1555}
1383 1556
1415 my ($pl) = @_; 1588 my ($pl) = @_;
1416 1589
1417 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1418 1591
1419 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1594
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1426 1601
1427 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1642
1468 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1469 my $path = path $login; 1644 my $path = path $login;
1470 1645
1471 # a .pst is a dead give-away for a valid player 1646 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1652 }
1477 1653
1508 } 1684 }
1509 1685
1510 \@paths 1686 \@paths
1511} 1687}
1512 1688
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1690
1515Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1692
1564=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1565 1694
1566Sends an ext reply to the player. 1695Sends an ext reply to the player.
1567 1696
1634our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1636 1765
1637sub generate_random_map { 1766sub generate_random_map {
1638 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1639 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1772 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1897
1766# the temporary/swap location 1898# the temporary/swap location
1767sub save_path { 1899sub save_path {
1768 my ($self) = @_; 1900 my ($self) = @_;
1769 1901
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1772} 1904}
1773 1905
1774# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1775sub uniq_path { 1907sub uniq_path {
1776 my ($self) = @_; 1908 my ($self) = @_;
1777 1909
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1912}
1790 1913
1791sub decay_objects { 1914sub decay_objects {
1792 my ($self) = @_; 1915 my ($self) = @_;
1793 1916
1877sub find { 2000sub find {
1878 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1879 2002
1880 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1881 2004
1882 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2007
1885 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1890 or return; 2010 or return;
1891 2011
1892 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1893 2013
1895 or return; 2015 or return;
1896 2016
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
1900 undef $guard1; 2021 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2022 $map->reset;
1903 return find $path; 2023 return find $path;
1904 } 2024 }
1905 2025
1906 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1907 } 2027 }
1908} 2028}
1909 2029
1910sub pre_load { } 2030sub pre_load { }
1911sub post_load { } 2031#sub post_load { } # XS
1912 2032
1913sub load { 2033sub load {
1914 my ($self) = @_; 2034 my ($self) = @_;
1915 2035
1916 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2054 $f->skip_block;
1935 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
1936 or return; 2056 or return;
1937 2057
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1939 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1940 2060
1941 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2062 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2082 $self->decay_objects;
1963 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1964 $self->update_buttons; 2084 $self->update_buttons;
1965 cf::cede_to_tick; 2085 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2086 $self->activate;
1969 } 2087 }
1970 2088
1971 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
1973 2091
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2093 }
1976 2094
1977 $self->post_load; 2095 $self->post_load;
1978} 2096}
1979 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
1980sub customise_for { 2101sub customise_for {
1981 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
1982 2103
1983 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2105 if $self->per_player;
2037 my ($path, $origin, $load) = @_; 2158 my ($path, $origin, $load) = @_;
2038 2159
2039 $path = normalise $path, $origin && $origin->{path}; 2160 $path = normalise $path, $origin && $origin->{path};
2040 2161
2041 if (my $map = $cf::MAP{$path}) { 2162 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2164 }
2044 2165
2045 $MAP_PREFETCH{$path} |= $load; 2166 $MAP_PREFETCH{$path} |= $load;
2046 2167
2047 $MAP_PREFETCHER ||= cf::async { 2168 $MAP_PREFETCHER ||= cf::async {
2169 $Coro::current->{desc} = "map prefetcher";
2170
2048 while (%MAP_PREFETCH) { 2171 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2172 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2173 if (my $map = find $k) {
2051 $map->load if $v; 2174 $map->load if $v;
2052 } 2175 }
2078 return if $self->{deny_save}; 2201 return if $self->{deny_save};
2079 2202
2080 local $self->{last_access} = $self->last_access;#d# 2203 local $self->{last_access} = $self->last_access;#d#
2081 2204
2082 cf::async { 2205 cf::async {
2206 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2207 $_->contr->save for $self->players;
2084 }; 2208 };
2209
2210 cf::get_slot 0.02;
2085 2211
2086 if ($uniq) { 2212 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2214 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2215 } else {
2098 $self->save; 2224 $self->save;
2099 2225
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2227
2102 return if $self->players; 2228 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2229 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2105 2231
2106 $self->in_memory (cf::MAP_SWAPPED); 2232 $self->in_memory (cf::MAP_SWAPPED);
2107 2233
2108 $self->deactivate; 2234 $self->deactivate;
2133 2259
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2261
2136 return if $self->players; 2262 return if $self->players;
2137 2263
2138 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2139 2265
2140 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2141 2267
2142 # need to save uniques path 2268 # need to save uniques path
2143 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2226 2352
2227sub unique_maps() { 2353sub unique_maps() {
2228 [ 2354 [
2229 map { 2355 map {
2230 utf8::decode $_; 2356 utf8::decode $_;
2231 /\.map$/ 2357 s/\.map$//; # TODO future compatibility hack
2358 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2359 ? ()
2232 ? normalise $_ 2360 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2362 ]
2236} 2363}
2237 2364
2238package cf; 2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2239 2396
2240=back 2397=back
2241 2398
2242=head3 cf::object 2399=head3 cf::object
2243 2400
2247 2404
2248=over 4 2405=over 4
2249 2406
2250=item $ob->inv_recursive 2407=item $ob->inv_recursive
2251 2408
2252Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2253 2411
2254=cut 2412=cut
2255 2413
2256sub inv_recursive_; 2414sub inv_recursive_;
2257sub inv_recursive_ { 2415sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2263} 2421}
2264 2422
2265=item $ref = $ob->ref 2423=item $ref = $ob->ref
2266 2424
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2268 2426
2269=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2270 2428
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2430even if the object actually exists. May block.
2274=cut 2432=cut
2275 2433
2276sub deref { 2434sub deref {
2277 my ($ref) = @_; 2435 my ($ref) = @_;
2278 2436
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2438 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2440 or return;
2286 $pl->ob->uuid eq $uuid 2441 $pl->ob->uuid eq $uuid
2287 or return; 2442 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2463dialogue with the given NPC character.
2309 2464
2310=cut 2465=cut
2311 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2312# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2482# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2498
2330 } else { 2499 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2502 }
2334 } 2503 }
2335} 2504}
2336 2505
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2531
2363=item $player_object->enter_link 2532=item $player_object->enter_link
2364 2533
2365Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2366 2535
2367The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2369 2540
2370Will never block. 2541Will never block.
2371 2542
2372=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2373 2544
2425 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2427 2598
2428 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2431 2602
2432 $map->load; 2603 $map->load;
2433 $map->load_neighbours; 2604 $map->load_neighbours;
2434 2605
2435 return unless $self->contr->active; 2606 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2607
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2440} 2613}
2441 2614
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2616
2444Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2620the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2621be called at the end of this process.
2449 2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2625
2450=cut 2626=cut
2451 2627
2452our $GOTOGEN; 2628our $GOTOGEN;
2453 2629
2454sub cf::object::player::goto { 2630sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2635
2460 $self->enter_link; 2636 $self->enter_link;
2461 2637
2462 (async { 2638 (async {
2639 $Coro::current->{desc} = "player::goto $path $x $y";
2640
2463 # *tag paths override both path and x|y 2641 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2642 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2643 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2644 my $ob = $obs[rand @obs];
2467 2645
2530} 2708}
2531 2709
2532sub prepare_random_map { 2710sub prepare_random_map {
2533 my ($exit) = @_; 2711 my ($exit) = @_;
2534 2712
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2713 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2714 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2715 # that depends on the exit object
2540 2716
2541 my $rmp = parse_random_map_params $exit->msg; 2717 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2719 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2720 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2721 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2722 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2723 $rmp->{origin_y} = $exit->y;
2724
2725 $exit->map->touch;
2548 } 2726 }
2549 2727
2550 $rmp->{random_seed} ||= $exit->random_seed; 2728 $rmp->{random_seed} ||= $exit->random_seed;
2551 2729
2552 my $data = cf::to_json $rmp; 2730 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2731 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2732 my $meta = "$RANDOMDIR/$md5.meta";
2555 2733
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2734 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2735 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2736 undef $fh;
2559 aio_rename "$meta~", $meta; 2737 aio_rename "$meta~", $meta;
2560 2738
2739 my $slaying = "?random/$md5";
2740
2741 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2742 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2743 $exit->msg (undef);
2744 }
2563 } 2745 }
2564} 2746}
2565 2747
2566sub cf::object::player::enter_exit { 2748sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2749 my ($self, $exit) = @_;
2568 2750
2569 return unless $self->type == cf::PLAYER; 2751 return unless $self->type == cf::PLAYER;
2570 2752
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2753 $self->enter_link;
2583 2754
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2755 (async {
2589 $self->deactivate_recursive; # just to be sure 2756 $Coro::current->{desc} = "enter_exit";
2757
2590 unless (eval { 2758 unless (eval {
2759 $self->deactivate_recursive; # just to be sure
2760
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2770 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp;
2772
2591 $self->goto ($slaying, $hp, $sp); 2773 $self->goto ($map, $x, $y);
2592 2774
2775 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y)
2777 if $exit->flag (cf::FLAG_DAMNED);
2778
2593 1; 2779 1
2594 }) { 2780 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2785
2600 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2617sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2619 2805
2620 utf8::encode $text; 2806 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2622} 2833}
2623 2834
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 2836
2626Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2840the message unless the client supports the msg packet.
2630 2841
2631=cut 2842=cut
2632 2843
2844# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2634 "c/identify" => { 2852 "c/identify" => {
2635 id => "identify", 2853 id => "infobox",
2636 title => "Identify", 2854 title => "Identify",
2637 reply => undef, 2855 reply => undef,
2638 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2639 }, 2857 },
2640 "c/examine" => { 2858 "c/examine" => {
2641 id => "examine", 2859 id => "infobox",
2642 title => "Examine", 2860 title => "Examine",
2643 reply => undef, 2861 reply => undef,
2644 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2645 }, 2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2869 },
2870 "c/book" => {
2871 id => "infobox",
2872 title => "Book",
2873 reply => undef,
2874 tooltip => "The contents of a note or book",
2875 },
2876 "c/lookat" => {
2877 id => "infobox",
2878 title => "Look",
2879 reply => undef,
2880 tooltip => "What you saw there",
2881 },
2882 "c/who" => {
2883 id => "infobox",
2884 title => "Players",
2885 reply => undef,
2886 tooltip => "Shows players who are currently online",
2887 },
2888 "c/body" => {
2889 id => "infobox",
2890 title => "Body Parts",
2891 reply => undef,
2892 tooltip => "Shows which body parts you posess and are available",
2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2930 "c/uptime" => {
2931 id => "infobox",
2932 title => "Uptime",
2933 reply => undef,
2934 tooltip => "How long the server has been running since last restart",
2935 },
2936 "c/mapinfo" => {
2937 id => "infobox",
2938 title => "Map Info",
2939 reply => undef,
2940 tooltip => "Information related to the maps",
2941 },
2942 "c/party" => {
2943 id => "party",
2944 title => "Party",
2945 reply => "gsay ",
2946 tooltip => "Messages and chat related to your party",
2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2646); 2956);
2647 2957
2648sub cf::client::send_msg { 2958sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2960
2651 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2652 2963
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2965
2655 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2967 if ($CHANNEL{$channel}) {
2968 $channel = $CHANNEL{$channel};
2657 2969
2970 $self->ext_msg (channel_info => $channel);
2971 $channel = $channel->{id};
2972
2658 if (ref $channel) { 2973 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 2978 }
2665 2979
2666 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2667 } 2981 }
2668 2982
2669 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2670 2984
2671 if ($self->can_msg) {
2672 # default colour, mask it out 2985 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2675 2988
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 2992 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 2993
2690 $color &= cf::NDI_COLOR_MASK; 2994 $self->send_big_packet ($pkt);
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703} 2995}
2704 2996
2705=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2706 2998
2707Sends an ext event to the client. 2999Sends an ext event to the client.
2710 3002
2711sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2713 3005
2714 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 } 3011 }
2720} 3012}
2721 3013
2722=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2723 3015
2727 3019
2728sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2730 3022
2731 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove 3026 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 } 3029 }
2738} 3030}
2739 3031
2740=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2741 3033
2842 3134
2843 $coro 3135 $coro
2844} 3136}
2845 3137
2846cf::client->attach ( 3138cf::client->attach (
2847 on_destroy => sub { 3139 on_client_destroy => sub {
2848 my ($ns) = @_; 3140 my ($ns) = @_;
2849 3141
2850 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2851 }, 3143 },
2852); 3144);
2868our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
2869 3161
2870$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
2871 3163
2872$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
2874 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
2875 sort time 3167 sort time
2876)); 3168));
2877 3169
2878# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
2880=pod 3172=pod
2881 3173
2882The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
2883 3175
2884 cf::object 3176 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3177 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3178 insert remove name archname title slaying race decrease split
3179 value
2887 3180
2888 cf::object::player 3181 cf::object::player
2889 player 3182 player
2890 3183
2891 cf::player 3184 cf::player
2896 3189
2897=cut 3190=cut
2898 3191
2899for ( 3192for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3195 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
2906) { 3199) {
2907 no strict 'refs'; 3200 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2927 3220
2928 my $qcode = $code; 3221 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
2931 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
2932 local $_; 3228 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars;
2934 3229
2935 my $eval = 3230 my $eval =
2936 "do {\n" 3231 "do {\n"
2937 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2938 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
2939 . $code 3234 . $code
2940 . "\n}" 3235 . "\n}"
2941 ; 3236 ;
2942 3237
3238 if ($CFG{safe_eval}) {
2943 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
2944 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2945 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
2946 3247
2947 if ($@) { 3248 if ($@) {
2948 warn "$@"; 3249 warn "$@";
2949 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
2950 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
2969=cut 3270=cut
2970 3271
2971sub register_script_function { 3272sub register_script_function {
2972 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
2973 3274
2974 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
2975 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
2976} 3277}
2977 3278
2978=back 3279=back
2979 3280
2980=cut 3281=cut
3001 3302
3002 $facedata->{version} == 2 3303 $facedata->{version} == 2
3003 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004 3305
3005 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3006 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC, 3309 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3009 }; 3312 };
3010 cf::cede_to_tick; 3313 cf::cede_to_tick;
3011 3314
3012 { 3315 {
3013 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3014 3317
3015 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320
3017 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3021 3325
3022 cf::cede_to_tick; 3326 cf::cede_to_tick;
3023 } 3327 }
3024 3328
3025 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3330 next unless $info->{smooth};
3331
3027 my $idx = cf::face::find $face 3332 my $idx = cf::face::find $face
3028 or next; 3333 or next;
3334
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3335 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3336 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3338 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3339 warn "smooth face '$info->{smooth}' not found for face '$face'";
3047 3353
3048 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3049 } 3355 }
3050 3356
3051 { 3357 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3055 3359
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061 3363
3062 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3063 # prepend meta info 3365 cf::face::set_type $idx, $info->{type};
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else { 3366 } else {
3072 $data = $info->{data}; 3367 $RESOURCE{$name} = $info;
3073 } 3368 }
3074 3369
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3370 cf::cede_to_tick;
3079 } 3371 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3372 }
3373
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3375
3100 1 3376 1
3101} 3377}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3102 3398
3103register_exticmd fx_want => sub { 3399register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3400 my ($ns, $want) = @_;
3105 3401
3106 while (my ($k, $v) = each %$want) { 3402 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3403 $ns->fx_want ($k, $v);
3108 } 3404 }
3109}; 3405};
3406
3407sub load_resource_file($) {
3408 my $guard = lock_acquire "load_resource_file";
3409
3410 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100;
3412 cf::arch::commit_load;
3413
3414 $status
3415}
3110 3416
3111sub reload_regions { 3417sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3418 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3419 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3420 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3434}
3129 3435
3130sub reload_archetypes { 3436sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3437 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3438 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3439}
3139 3440
3140sub reload_treasures { 3441sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3442 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3443 or die "unable to load treasurelists\n";
3143} 3444}
3144 3445
3145sub reload_resources { 3446sub reload_resources {
3146 warn "reloading resource files...\n"; 3447 warn "reloading resource files...\n";
3147 3448
3449 reload_facedata;
3450 reload_archetypes;
3148 reload_regions; 3451 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3452 reload_treasures;
3153 3453
3154 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3155} 3455}
3156 3456
3157sub init {
3158 reload_resources;
3159}
3160
3161sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3461 or return;
3164 3462
3165 local $/; 3463 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3167 3465
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3467
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3176 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3177 }; 3475 };
3178 warn $@ if $@; 3476 warn $@ if $@;
3179 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3180} 3508}
3181 3509
3182sub main { 3510sub main {
3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524
3183 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3528 (async {
3187 Event::one_event; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3530 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3189 }; 3532 };
3190 3533
3534 evthread_start IO::AIO::poll_fileno;
3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3191 reload_config; 3541 reload_config;
3192 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_skills;
3547
3548 cf::init_beforeplay;
3549
3550 atomic;
3551
3193 load_extensions; 3552 load_extensions;
3194 3553
3195 $TICK_WATCHER->start; 3554 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3555
3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559
3560 (pop @POST_INIT)->(0) while @POST_INIT;
3561 };
3562
3563 main_loop;
3197} 3564}
3198 3565
3199############################################################################# 3566#############################################################################
3200# initialisation and cleanup 3567# initialisation and cleanup
3201 3568
3202# install some emergency cleanup handlers 3569# install some emergency cleanup handlers
3203BEGIN { 3570BEGIN {
3571 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3572 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3573 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3574 cf::cleanup "SIG$signal";
3212 },
3213 ); 3575 };
3214 } 3576 }
3215} 3577}
3216 3578
3217sub write_runtime { 3579sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3580 my $t0 = EV::time;
3219 3581
3220 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3222 3584
3223 IO::AIO::aio_utime $runtime, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3586
3225 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3226 3588
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3228 or return; 3590 or return;
3229 3591
3230 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
3242 aio_utime $fh, undef, undef; 3604 aio_utime $fh, undef, undef;
3243 3605
3244 close $fh 3606 close $fh
3245 or return; 3607 or return;
3246 3608
3247 aio_rename "$runtime~", $runtime 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3610 and return;
3249 3611
3250 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3251 3613
3252 1 3614 1
3615}
3616
3617our $uuid_lock;
3618our $uuid_skip;
3619
3620sub write_uuid_sync($) {
3621 $uuid_skip ||= $_[0];
3622
3623 return if $uuid_lock;
3624 local $uuid_lock = 1;
3625
3626 my $uuid = "$LOCALDIR/uuid";
3627
3628 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3629 or return;
3630
3631 my $value = uuid_seq uuid_cur;
3632
3633 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n";
3635 return;
3636 }
3637
3638 my $value = uuid_str $value + $uuid_skip;
3639 $uuid_skip = 0;
3640
3641 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3642 and return;
3643
3644 # always fsync - this file is important
3645 aio_fsync $fh
3646 and return;
3647
3648 close $fh
3649 or return;
3650
3651 aio_rename "$uuid~", $uuid
3652 and return;
3653
3654 warn "uuid file written ($value).\n";
3655
3656 1
3657
3658}
3659
3660sub write_uuid($$) {
3661 my ($skip, $sync) = @_;
3662
3663 $sync ? write_uuid_sync $skip
3664 : async { write_uuid_sync $skip };
3253} 3665}
3254 3666
3255sub emergency_save() { 3667sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3668 my $freeze_guard = cf::freeze_mainloop;
3257 3669
3258 warn "enter emergency perl save\n"; 3670 warn "emergency_perl_save: enter\n";
3259 3671
3260 cf::sync_job { 3672 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677
3261 # use a peculiar iteration method to avoid tripping on perl 3678 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3679 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3680 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3681 warn "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3682 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3683 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3684 $pl->valid or next;
3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3686 $pl->save;
3269 } 3687 }
3270 warn "end emergency player save\n"; 3688 warn "emergency_perl_save: end player save\n";
3271 3689
3272 warn "begin emergency map save\n"; 3690 warn "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3691 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3692 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3693 $map->valid or next;
3276 $map->save; 3694 $map->save;
3277 } 3695 }
3278 warn "end emergency map save\n"; 3696 warn "emergency_perl_save: end map save\n";
3279 3697
3280 warn "begin emergency database checkpoint\n"; 3698 warn "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3699 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3700 warn "emergency_perl_save: end database checkpoint\n";
3701
3702 warn "emergency_perl_save: begin write uuid\n";
3703 write_uuid_sync 1;
3704 warn "emergency_perl_save: end write uuid\n";
3283 }; 3705 };
3284 3706
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3285 warn "leave emergency perl save\n"; 3712 warn "emergency_perl_save: leave\n";
3286} 3713}
3287 3714
3288sub post_cleanup { 3715sub post_cleanup {
3289 my ($make_core) = @_; 3716 my ($make_core) = @_;
3290 3717
3291 warn Carp::longmess "post_cleanup backtrace" 3718 warn Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3719 if $make_core;
3720
3721 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$;
3723}
3724
3725# a safer delete_package, copied from Symbol
3726sub clear_package($) {
3727 my $pkg = shift;
3728
3729 # expand to full symbol table name if needed
3730 unless ($pkg =~ /^main::.*::$/) {
3731 $pkg = "main$pkg" if $pkg =~ /^::/;
3732 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3733 $pkg .= '::' unless $pkg =~ /::$/;
3734 }
3735
3736 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3737 my $stem_symtab = *{$stem}{HASH};
3738
3739 defined $stem_symtab and exists $stem_symtab->{$leaf}
3740 or return;
3741
3742 # clear all symbols
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 }
3748 warn "cleared package $pkg\n";#d#
3293} 3749}
3294 3750
3295sub do_reload_perl() { 3751sub do_reload_perl() {
3296 # can/must only be called in main 3752 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3298 warn "can only reload from main coroutine"; 3754 warn "can only reload from main coroutine";
3299 return; 3755 return;
3300 } 3756 }
3301 3757
3758 return if $RELOAD++;
3759
3760 my $t1 = EV::time;
3761
3762 while ($RELOAD) {
3302 warn "reloading..."; 3763 warn "reloading...";
3303 3764
3304 warn "entering sync_job"; 3765 warn "entering sync_job";
3305 3766
3306 cf::sync_job { 3767 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3769 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3770 cf::write_runtime_sync; # external watchdog should not bark
3310 3771
3311 warn "syncing database to disk"; 3772 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3773 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3774
3314 # if anything goes wrong in here, we should simply crash as we already saved 3775 # if anything goes wrong in here, we should simply crash as we already saved
3315 3776
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3777 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3778 while (IO::AIO::nreqs || BDB::nreqs) {
3327 warn "iterate..."; 3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = ();
3335
3336 warn "removing commands";
3337 %COMMAND = ();
3338
3339 warn "removing ext/exti commands";
3340 %EXTCMD = ();
3341 %EXTICMD = ();
3342
3343 warn "unloading/nuking all extensions";
3344 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg";
3346
3347 if (my $cb = $pkg->can ("unload")) {
3348 eval {
3349 $cb->($pkg);
3350 1
3351 } or warn "$pkg unloaded, but with errors: $@";
3352 } 3780 }
3353 3781
3354 warn "... nuking $pkg"; 3782 warn "cancelling all extension coros";
3355 Symbol::delete_package $pkg; 3783 $_->cancel for values %EXT_CORO;
3356 } 3784 %EXT_CORO = ();
3357 3785
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3786 warn "removing commands";
3359 while (my ($k, $v) = each %INC) { 3787 %COMMAND = ();
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 3788
3789 warn "removing ext/exti commands";
3790 %EXTCMD = ();
3791 %EXTICMD = ();
3792
3793 warn "unloading/nuking all extensions";
3794 for my $pkg (@EXTS) {
3362 warn "... unloading $k"; 3795 warn "... unloading $pkg";
3363 delete $INC{$k};
3364 3796
3365 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g;
3367
3368 if (my $cb = $k->can ("unload_module")) { 3797 if (my $cb = $pkg->can ("unload")) {
3798 eval {
3369 $cb->(); 3799 $cb->($pkg);
3800 1
3801 } or warn "$pkg unloaded, but with errors: $@";
3802 }
3803
3804 warn "... clearing $pkg";
3805 clear_package $pkg;
3370 } 3806 }
3371 3807
3372 Symbol::delete_package $k; 3808 warn "unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811
3812 warn "... unloading $k";
3813 delete $INC{$k};
3814
3815 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g;
3817
3818 if (my $cb = $k->can ("unload_module")) {
3819 $cb->();
3820 }
3821
3822 clear_package $k;
3373 } 3823 }
3374 3824
3375 warn "getting rid of safe::, as good as possible"; 3825 warn "getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 3826 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 3828
3379 warn "unloading cf.pm \"a bit\""; 3829 warn "unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 3830 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 3832
3383 # don't, removes xs symbols, too, 3833 # don't, removes xs symbols, too,
3384 # and global variables created in xs 3834 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 3835 #clear_package __PACKAGE__;
3386 3836
3387 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
3388 3838
3389 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
3390 require cf; 3840 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
3392 3842
3393 warn "loading config and database again"; 3843 warn "loading config and database again";
3394 cf::reload_config; 3844 cf::reload_config;
3395 3845
3396 warn "loading extensions"; 3846 warn "loading extensions";
3397 cf::load_extensions; 3847 cf::load_extensions;
3398 3848
3849 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 3850 warn "reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 3851 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 3852 warn "reattaching attachments to maps";
3402 reattach $_ for values %MAP; 3853 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 3854 warn "reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 3855 reattach $_ for values %PLAYER;
3856 }
3405 3857
3858 warn "running post_init jobs";
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860
3406 warn "leaving sync_job"; 3861 warn "leaving sync_job";
3407 3862
3408 1 3863 1
3409 } or do { 3864 } or do {
3410 warn $@; 3865 warn $@;
3411 warn "error while reloading, exiting."; 3866 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3867 };
3414 3868
3415 warn "reloaded"; 3869 warn "reloaded";
3870 --$RELOAD;
3871 }
3872
3873 $t1 = EV::time - $t1;
3874 warn "reload completed in ${t1}s\n";
3416}; 3875};
3417 3876
3418our $RELOAD_WATCHER; # used only during reload 3877our $RELOAD_WATCHER; # used only during reload
3419 3878
3420sub reload_perl() { 3879sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3880 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3881 # coro crashes during coro_state_free->destroy here.
3423 3882
3424 $RELOAD_WATCHER ||= Event->timer ( 3883 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 3884 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 3885
3427 data => WF_AUTOCANCEL, 3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 3887 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3888 undef $RELOAD_WATCHER;
3431 }, 3889 };
3432 ); 3890 };
3433} 3891}
3434 3892
3435register_command "reload" => sub { 3893register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3894 my ($who, $arg) = @_;
3437 3895
3438 if ($who->flag (FLAG_WIZ)) { 3896 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3897 $who->message ("reloading server.");
3898 async {
3899 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3900 reload_perl;
3901 };
3441 } 3902 }
3442}; 3903};
3443 3904
3444unshift @INC, $LIBDIR; 3905unshift @INC, $LIBDIR;
3445 3906
3447 3908
3448our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3450 3911
3451sub wait_for_tick { 3912sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3454 3914
3455 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3917 $signal->wait;
3458} 3918}
3459 3919
3460sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3463 3922
3464 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3925 $signal->wait;
3467} 3926}
3468 3927
3469$TICK_WATCHER = Event->timer ( 3928sub tick {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3929 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3930 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3479 return; 3932 return;
3480 } 3933 }
3481 3934
3482 $NOW = $tick_start = Event::time;
3483
3484 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3485 3936
3486 $RUNTIME += $TICK; 3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3487 $NEXT_TICK += $TICK;
3488 3938
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3941 Coro::async_pool {
3942 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3943 write_runtime_sync
3493 or warn "ERROR: unable to write runtime file: $!"; 3944 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3945 };
3946 }
3496 3947
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3948 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3949 $sig->send;
3499 } 3950 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3951 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3952 $sig->send;
3502 } 3953 }
3503 3954
3504 $NOW = Event::time; 3955 $LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3956 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3957
3515 _post_tick; 3958 if (0) {
3959 if ($NEXT_TICK) {
3960 my $jitter = $TICK_START - $NEXT_TICK;
3961 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3962 warn "jitter $JITTER\n";#d#
3963 }
3516 }, 3964 }
3517); 3965}
3518 3966
3519{ 3967{
3968 # configure BDB
3969
3520 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3521 BDB::max_poll_time $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3972 $AnyEvent::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 3973
3546 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3549 | BDB::LOG_AUTOREMOVE, 1); 3977 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3978 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3979 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3980 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3552 3981
3553 cf::sync_job { 3982 cf::sync_job {
3554 eval { 3983 eval {
3564 3993
3565 cf::cleanup "db_env_open(db): $@" if $@; 3994 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3995 };
3567 } 3996 }
3568 3997
3569 $BDB_DEADLOCK_WATCHER = Event->timer ( 3998 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3999 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 ); 4000 };
3579 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4001 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4002 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 ); 4003 };
3589 $BDB_TRICKLE_WATCHER = Event->timer ( 4004 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4005 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 ); 4006 };
3599} 4007}
3600 4008
3601{ 4009{
4010 # configure IO::AIO
4011
3602 IO::AIO::min_parallel 8; 4012 IO::AIO::min_parallel 8;
3603
3604 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1; 4013 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io ( 4014 undef $AnyEvent::AIO::WATCHER;
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614} 4015}
3615 4016
3616my $_log_backtrace; 4017my $_log_backtrace;
3617 4018
3618sub _log_backtrace { 4019sub _log_backtrace {
3621 $msg =~ s/\n//; 4022 $msg =~ s/\n//;
3622 4023
3623 # limit the # of concurrent backtraces 4024 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 4025 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 4026 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg;
3626 async { 4028 async {
4029 $Coro::current->{desc} = "abt $msg";
4030
3627 my @bt = fork_call { 4031 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 4032 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4033 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4034 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 4035 or die "addr2line: $!";
3639 } 4043 }
3640 4044
3641 @funcs 4045 @funcs
3642 }; 4046 };
3643 4047
3644 LOG llevInfo, "[ABT] $msg\n"; 4048 LOG llevInfo, "[ABT] $perl_bt\n";
4049 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3645 LOG llevInfo, "[ABT] $_\n" for @bt; 4050 LOG llevInfo, "[ABT] $_\n" for @bt;
3646 --$_log_backtrace; 4051 --$_log_backtrace;
3647 }; 4052 };
3648 } else { 4053 } else {
3649 LOG llevInfo, "[ABT] $msg\n"; 4054 LOG llevInfo, "[ABT] $msg\n";
3650 LOG llevInfo, "[ABT] [suppressed]\n"; 4055 LOG llevInfo, "[ABT] [suppressed]\n";
3651 } 4056 }
3652} 4057}
3653 4058
3654# load additional modules 4059# load additional modules
3655use cf::pod; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3656 4062
3657END { cf::emergency_save } 4063END { cf::emergency_save }
3658 4064
36591 40651
3660 4066

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines