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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines