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.360 by root, Sun Sep 9 06:25:46 2007 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$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 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
86 130
87our %CFG; 131our %CFG;
88 132
89our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 134our $RUNTIME;
135our $NOW;
91 136
92our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
95 140
96# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
159 227
160The raw value load value from the last tick. 228The raw value load value from the last tick.
161 229
162=item %cf::CFG 230=item %cf::CFG
163 231
164Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 233from wherever your confdir points to.
166 234
167=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
168 236
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
173=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
174 247
175This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 250that call.
178 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
179=back 258=back
180 259
181=cut 260=cut
182 261
183BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 269 my $msg = join "", @_;
186 270
187 $msg .= "\n" 271 $msg .= "\n"
188 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
189 273
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 275
192 utf8::encode $msg;
193 LOG llevError, $msg; 276 LOG llevWarn, $msg;
194 }; 277};
195} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
196 292
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 303for my $pkg (qw(
208 cf::global cf::attachable 304 cf::global cf::attachable
209 cf::object cf::object::player 305 cf::object cf::object::player
210 cf::client cf::player 306 cf::client cf::player
211 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
212 cf::map cf::party cf::region 309 cf::party cf::region
213)) { 310)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 312}
217 313
218$Event::DIED = sub { 314$EV::DIED = sub {
219 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
220}; 316};
221 317
222############################################################################# 318#############################################################################
223 319
224=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 343 $d
248 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
249} 345}
250 346
251=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
252 348
253Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
254 350
255=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
256 352
257Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
258 354
259=cut 355=cut
260 356
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 358
263sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
265 404
266=item cf::lock_wait $string 405=item cf::lock_wait $string
267 406
268Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
269 408
270=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
271 410
272Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
275returned. 414returned.
276 415
277Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 417deadlocked coro.
284 423
285Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
286 425
287=cut 426=cut
288 427
289our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 429
292sub lock_wait($) { 430sub lock_wait($) {
293 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 432}
306 433
307sub lock_acquire($) { 434sub lock_acquire($) {
308 my ($key) = @_; 435 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 436}
322 437
323sub lock_active($) { 438sub lock_active($) {
324 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 440}
328 441
329sub freeze_mainloop { 442sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
331 444
332 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 446}
334 }; 447
335 $TICK_WATCHER->stop; 448=item cf::periodic $interval, $cb
336 $guard 449
450Like EV::periodic, but randomly selects a starting point so that the actions
451get spread over time.
452
453=cut
454
455sub periodic($$) {
456 my ($interval, $cb) = @_;
457
458 my $start = rand List::Util::min 180, $interval;
459
460 EV::periodic $start, $interval, 0, $cb
337} 461}
338 462
339=item cf::get_slot $time[, $priority[, $name]] 463=item cf::get_slot $time[, $priority[, $name]]
340 464
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 465Allocate $time seconds of blocking CPU time at priority C<$priority>:
349 473
350=cut 474=cut
351 475
352our @SLOT_QUEUE; 476our @SLOT_QUEUE;
353our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
354 479
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
482 $Coro::current->desc ("timeslot manager");
483
357 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
358 486
359 while () { 487 while () {
360 next_job: 488 next_job:
489
361 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 491
363 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 496 $job->[2]->send;
367 Coro::cede; 497 Coro::cede;
368 goto next_job; 498 goto next_job;
369 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 501 }
371 } 502 }
372 503
373 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 507 $signal->wait;
377 } else { 508 } else {
509 $busy = 0;
378 Coro::schedule; 510 Coro::schedule;
379 } 511 }
380 } 512 }
381}; 513};
382 514
383sub get_slot($;$$) { 515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
384 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
385 519
386 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
387 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
388 523
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
402 537
403BEGIN { *async = \&Coro::async_pool } 538BEGIN { *async = \&Coro::async_pool }
404 539
405=item cf::sync_job { BLOCK } 540=item cf::sync_job { BLOCK }
406 541
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 542The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 543is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 544partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 545acceptable.
411 546
412If it must be done, put the blocking parts into C<sync_job>. This will run 547If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 548the given BLOCK in another coroutine while waiting for the result. The
417=cut 552=cut
418 553
419sub sync_job(&) { 554sub sync_job(&) {
420 my ($job) = @_; 555 my ($job) = @_;
421 556
422 if ($Coro::current == $Coro::main) { 557 if (in_main) {
423 my $time = Event::time; 558 my $time = AE::time;
424 559
425 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
427 562
428 # TODO: use suspend/resume instead 563 #LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 564
430 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
431 566
432 my $busy = 1; 567 my $busy = 1;
433 my @res; 568 my @res;
434 569
435 (async { 570 (async {
571 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 572 @res = eval { $job->() };
437 warn $@ if $@; 573 error $@ if $@;
438 undef $busy; 574 undef $busy;
439 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
440 576
441 while ($busy) { 577 while ($busy) {
442 Coro::cede or Event::one_event; 578 if (Coro::nready) {
579 Coro::cede_notself;
580 } else {
581 EV::loop EV::LOOP_ONESHOT;
443 } 582 }
583 }
444 584
445 $time = Event::time - $time; 585 my $time = AE::time - $time;
446 586
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
451 588
452 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
453 } else { 590 } else {
454 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
455 592
475 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
476 613
477 $coro 614 $coro
478} 615}
479 616
480=item fork_call { }, $args 617=item fork_call { }, @args
481 618
482Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 622never block itself or use any form of event handling.
486 623
487=cut 624=cut
625
626sub post_fork {
627 reset_signals;
628}
488 629
489sub fork_call(&@) { 630sub fork_call(&@) {
490 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
491 632
492 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
493 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
495 636
496 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
497 reset_signals; 638 cf::post_fork;
498 &$cb 639 &$cb
499 }, @args; 640 } @args;
500 641
501 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
654}
655
656=item $coin = coin_from_name $name
657
658=cut
659
660our %coin_alias = (
661 "silver" => "silvercoin",
662 "silvercoin" => "silvercoin",
663 "silvercoins" => "silvercoin",
664 "gold" => "goldcoin",
665 "goldcoin" => "goldcoin",
666 "goldcoins" => "goldcoin",
667 "platinum" => "platinacoin",
668 "platinumcoin" => "platinacoin",
669 "platinumcoins" => "platinacoin",
670 "platina" => "platinacoin",
671 "platinacoin" => "platinacoin",
672 "platinacoins" => "platinacoin",
673 "royalty" => "royalty",
674 "royalties" => "royalty",
675);
676
677sub coin_from_name($) {
678 $coin_alias{$_[0]}
679 ? cf::arch::find $coin_alias{$_[0]}
680 : undef
502} 681}
503 682
504=item $value = cf::db_get $family => $key 683=item $value = cf::db_get $family => $key
505 684
506Returns a single value from the environment database. 685Returns a single value from the environment database.
508=item cf::db_put $family => $key => $value 687=item cf::db_put $family => $key => $value
509 688
510Stores the given C<$value> in the family. It can currently store binary 689Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 690data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 691
692=item $db = cf::db_table "name"
693
694Create and/or open a new database table. The string must not be "db" and must be unique
695within each server.
696
513=cut 697=cut
698
699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
703 my ($name) = @_;
704 my $db = BDB::db_create $DB_ENV;
705
706 eval {
707 $db->set_flags (BDB::CHKSUM);
708
709 utf8::encode $name;
710 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
711 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
712 cf::cleanup "db_open(db): $!" if $!;
713 };
714 cf::cleanup "db_open(db): $@" if $@;
715
716 $db
717}
514 718
515our $DB; 719our $DB;
516 720
517sub db_init { 721sub db_init {
518 unless ($DB) { 722 $DB ||= db_table "db";
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 }
532} 723}
533 724
534sub db_get($$) { 725sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
536 727
537 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
538 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
539 732
540 $! ? () 733 $! ? ()
541 : $data 734 : $data
542 }
543} 735}
544 736
545sub db_put($$$) { 737sub db_put($$$) {
546 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
603 795
604 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data); 797 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
607 799
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
609 801
610 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
613 805
623 815
624=cut 816=cut
625 817
626sub datalog($@) { 818sub datalog($@) {
627 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
628 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
629} 821}
630 822
631=back 823=back
632 824
633=cut 825=cut
634 826
635############################################################################# 827#############################################################################
636 828
637=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
638 830
639Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
642 834
643In the following description, CLASS can be any of C<global>, C<object> 835In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 836C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 837Deliantra).
646 838
647=over 4 839=over 4
648 840
649=item $attachable->attach ($attachment, key => $value...) 841=item $attachable->attach ($attachment, key => $value...)
650 842
694=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
695 887
696Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
698 890
699Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
701 893
702These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
703 895
704=over 4 896=over 4
828 1020
829 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
830 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
831 1023
832 } elsif (ref $type) { 1024 } elsif (ref $type) {
833 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
834 1026
835 } else { 1027 } else {
836 shift @arg; 1028 shift @arg;
837 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
838 } 1030 }
839 } 1031 }
840} 1032}
841 1033
842sub _object_attach { 1034sub _object_attach {
852 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
853 } 1045 }
854 1046
855 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
856 } else { 1048 } else {
857 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
858 } 1050 }
859 1051
860 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
861} 1053}
862 1054
921 1113
922 for (@$callbacks) { 1114 for (@$callbacks) {
923 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
924 1116
925 if ($@) { 1117 if ($@) {
926 warn "$@";
927 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
928 override; 1119 override;
929 } 1120 }
930 1121
931 return 1 if $override; 1122 return 1 if $override;
932 } 1123 }
933 1124
934 0 1125 0
935} 1126}
936 1127
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1128=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1129
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1131
941Generate an object-specific event with the given arguments. 1132Generate an object-specific event with the given arguments.
942 1133
948 1139
949=cut 1140=cut
950 1141
951############################################################################# 1142#############################################################################
952# object support 1143# object support
953#
954 1144
1145sub _object_equal($$);
1146sub _object_equal($$) {
1147 my ($a, $b) = @_;
1148
1149 return 0 unless (ref $a) eq (ref $b);
1150
1151 if ("HASH" eq ref $a) {
1152 my @ka = keys %$a;
1153 my @kb = keys %$b;
1154
1155 return 0 if @ka != @kb;
1156
1157 for (0 .. $#ka) {
1158 return 0 unless $ka[$_] eq $kb[$_];
1159 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1160 }
1161
1162 } elsif ("ARRAY" eq ref $a) {
1163
1164 return 0 if @$a != @$b;
1165
1166 for (0 .. $#$a) {
1167 return 0 unless _object_equal $a->[$_], $b->[$_];
1168 }
1169
1170 } elsif ($a ne $b) {
1171 return 0;
1172 }
1173
1174 1
1175}
1176
1177our $SLOW_MERGES;#d#
955sub _can_merge { 1178sub _can_merge {
956 my ($ob1, $ob2) = @_; 1179 my ($ob1, $ob2) = @_;
957 1180
958 local $Storable::canonical = 1; 1181 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1182
962 $fob1 eq $fob2 1183 # we do the slow way here
1184 return _object_equal $ob1, $ob2
963} 1185}
964 1186
965sub reattach { 1187sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1189 my ($obj) = @_;
968 1190
1191 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1193
971 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
972 1195
973 @$registry = (); 1196 @$registry = ();
974 1197
979 for (@$attach) { 1202 for (@$attach) {
980 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
981 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
982 } 1205 }
983 } else { 1206 } else {
984 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
985 } 1208 }
986 } 1209 }
987} 1210}
988 1211
989cf::attachable->attach ( 1212cf::attachable->attach (
990 prio => -1000000, 1213 prio => -1000000,
991 on_instantiate => sub { 1214 on_instantiate => sub {
992 my ($obj, $data) = @_; 1215 my ($obj, $data) = @_;
993 1216
994 $data = from_json $data; 1217 $data = decode_json $data;
995 1218
996 for (@$data) { 1219 for (@$data) {
997 my ($name, $args) = @$_; 1220 my ($name, $args) = @$_;
998 1221
999 $obj->attach ($name, %{$args || {} }); 1222 $obj->attach ($name, %{$args || {} });
1013); 1236);
1014 1237
1015sub object_freezer_save { 1238sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1017 1240
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1241 sync_job {
1021 if (length $$rdata) { 1242 if (length $$rdata) {
1243 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1024 1247
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1029 close $fh; 1255 aio_close $fh;
1030 1256
1031 if (@$objs) { 1257 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1037 close $fh; 1266 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1268 }
1040 } else { 1269 } else {
1041 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1042 } 1271 }
1043 1272
1044 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1277 } else {
1046 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1047 } 1279 }
1048 } else { 1280 } else {
1049 aio_unlink $filename; 1281 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1051 } 1283 }
1052 }; 1284 };
1053
1054 undef $guard;
1055} 1285}
1056 1286
1057sub object_freezer_as_string { 1287sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1288 my ($rdata, $objs) = @_;
1059 1289
1064 1294
1065sub object_thawer_load { 1295sub object_thawer_load {
1066 my ($filename) = @_; 1296 my ($filename) = @_;
1067 1297
1068 my ($data, $av); 1298 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1299
1072 (aio_load $filename, $data) >= 0 1300 (aio_load $filename, $data) >= 0
1073 or return; 1301 or return;
1074 1302
1075 unless (aio_stat "$filename.pst") { 1303 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1304 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1305 or return;
1078 1306
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1307 my $st = eval { Coro::Storable::thaw $av };
1308 $av = $st->{objs};
1081 } 1309 }
1082 1310
1311 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1085 1315
1086 ($data, $av) 1316 ($data, $av)
1087} 1317}
1088 1318
1089=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1146 1376
1147 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1148} 1378}
1149 1379
1380use File::Glob ();
1381
1150cf::player->attach ( 1382cf::player->attach (
1151 on_command => sub { 1383 on_unknown_command => sub {
1152 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1153 1385
1154 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1155 or return; 1387 or return;
1156 1388
1179 1411
1180 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1181 if $reply; 1413 if $reply;
1182 1414
1183 } else { 1415 } else {
1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1185 } 1417 }
1186 1418
1187 cf::override; 1419 cf::override;
1188 }, 1420 },
1189); 1421);
1190 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1191sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1192 cf::sync_job { 1439 cf::sync_job {
1193 my %todo; 1440 my %todo;
1194 1441
1195 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1196 next unless -r $path; 1443 next unless -r $path;
1214 1461
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1464
1218 $ext{source} = 1465 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1220 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1221 . $source 1468 . $source
1222 . "\n};\n1"; 1469 . "\n};\n1";
1223 1470
1224 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1225 } 1472 }
1226 1473
1474 my $pass = 0;
1227 my %done; 1475 my %done;
1228 while (%todo) { 1476 while (%todo) {
1229 my $progress; 1477 my $progress;
1230 1478
1479 ++$pass;
1480
1481 ext:
1231 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip 1484 next ext
1234 unless exists $done{$_}; 1485 unless exists $done{$_};
1235 } 1486 }
1236 1487
1237 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1238 1489
1239 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1240 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1241 : "$v->{base}: extension inactive.\n";
1242 1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1243 if (exists $v->{meta}{mandatory}) { 1496 if exists $v->{meta}{mandatory};
1244 warn $msg; 1497
1245 warn "mandatory extension failed to load, exiting.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1246 exit 1; 1499 delete $todo{$k};
1247 } 1500 } else {
1248 1501 $done{$k} = delete $todo{$k};
1249 warn $msg; 1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1250 } 1507 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1255 } 1508 }
1256 1509
1257 skip: 1510 unless ($progress) {
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1259 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1260 } 1518 }
1261 }; 1519 };
1262} 1520}
1263 1521
1264############################################################################# 1522#############################################################################
1265 1523
1266=back 1524=back
1267 1525
1268=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1269 1527
1270Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1271 1529
1272=cut 1530=cut
1273 1531
1274package cf::player; 1532package cf::player;
1275 1533
1276use Coro::AIO; 1534use Coro::AIO;
1277 1535
1278=head3 cf::player 1536=head3 cf::player
1279 1537
1280=over 4 1538=over 4
1539
1540=item cf::player::num_playing
1541
1542Returns the official number of playing players, as per the Crossfire metaserver rules.
1543
1544=cut
1545
1546sub num_playing {
1547 scalar grep
1548 $_->ob->map
1549 && !$_->hidden
1550 && !$_->ob->flag (cf::FLAG_WIZ),
1551 cf::player::list
1552}
1281 1553
1282=item cf::player::find $login 1554=item cf::player::find $login
1283 1555
1284Returns the given player object, loading it if necessary (might block). 1556Returns the given player object, loading it if necessary (might block).
1285 1557
1304 1576
1305sub exists($) { 1577sub exists($) {
1306 my ($login) = @_; 1578 my ($login) = @_;
1307 1579
1308 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1310} 1582}
1311 1583
1312sub find($) { 1584sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1586 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1597
1326 my $f = new_from_file cf::object::thawer path $login 1598 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1599 or return;
1328 1600
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1601 my $pl = cf::player::load_pl $f
1331 or return; 1602 or return;
1603
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1604 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1605 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1335 } 1607 }
1336 } 1608 }
1337} 1609}
1338 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1339sub save($) { 1624sub save($) {
1340 my ($pl) = @_; 1625 my ($pl) = @_;
1341 1626
1342 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1343 1628
1346 1631
1347 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1348 1633
1349 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1636
1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1351 1641
1352 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1643 cf::cede_to_tick;
1354} 1644}
1355 1645
1387 my ($pl) = @_; 1677 my ($pl) = @_;
1388 1678
1389 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1390 1680
1391 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1393 1683
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1395 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1397 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1398 1692
1399 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1401 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1439 1733
1440 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1441 my $path = path $login; 1735 my $path = path $login;
1442 1736
1443 # a .pst is a dead give-away for a valid player 1737 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1743 }
1449 1744
1453 1748
1454 \@logins 1749 \@logins
1455} 1750}
1456 1751
1457=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1458 1755
1459Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1460player. May block. 1757player. May block.
1461 1758
1462=cut 1759=cut
1480 } 1777 }
1481 1778
1482 \@paths 1779 \@paths
1483} 1780}
1484 1781
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1783
1487Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1785
1536=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1537 1787
1538Sends an ext reply to the player. 1788Sends an ext reply to the player.
1539 1789
1571 1821
1572=cut 1822=cut
1573 1823
1574sub find_by_path($) { 1824sub find_by_path($) {
1575 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1576 1828
1577 my ($match, $specificity); 1829 my ($match, $specificity);
1578 1830
1579 for my $region (list) { 1831 for my $region (list) {
1580 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1606our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1608 1860
1609sub generate_random_map { 1861sub generate_random_map {
1610 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1611 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1612 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1616 $rmp->{exit_on_final_map},
1617 $rmp->{xsize}, $rmp->{ysize},
1618 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1619 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1620 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1621 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1622 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1623 (cf::region::find $rmp->{region}), $rmp->{custom}
1624 )
1625} 1867}
1626 1868
1627=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1628 1870
1629Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1634 1876
1635sub register { 1877sub register {
1636 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1637 my $pkg = caller; 1879 my $pkg = caller;
1638 1880
1639 no strict;
1640 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1641 1882
1642 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1643} 1884}
1644 1885
1645# also paths starting with '/' 1886# also paths starting with '/'
1646$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1647 1888
1648sub thawer_merge { 1889sub thawer_merge {
1649 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1650 1891
1651 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1656} 1897}
1657 1898
1658sub normalise { 1899sub normalise {
1659 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1660 1901
1661 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1662 1903
1663 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1664 1905
1665 # map plan: 1906 # map plan:
1666 # 1907 #
1681 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1682 $path = "$base/$path"; 1923 $path = "$base/$path";
1683 } 1924 }
1684 1925
1685 for ($path) { 1926 for ($path) {
1686 redo if s{//}{/};
1687 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1688 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1689 } 1929 }
1690 1930
1691 $path 1931 $path
1705 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1706 return $self; 1946 return $self;
1707 } 1947 }
1708 } 1948 }
1709 1949
1710 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1711 () 1951 ()
1712} 1952}
1713 1953
1714sub init { 1954sub init {
1715 my ($self) = @_; 1955 my ($self) = @_;
1737 1977
1738# the temporary/swap location 1978# the temporary/swap location
1739sub save_path { 1979sub save_path {
1740 my ($self) = @_; 1980 my ($self) = @_;
1741 1981
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1744} 1984}
1745 1985
1746# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1747sub uniq_path { 1987sub uniq_path {
1748 my ($self) = @_; 1988 my ($self) = @_;
1749 1989
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1752}
1753
1754# and all this just because we cannot iterate over
1755# all maps in C++...
1756sub change_all_map_light {
1757 my ($change) = @_;
1758
1759 $_->change_map_light ($change)
1760 for grep $_->outdoor, values %cf::MAP;
1761} 1992}
1762 1993
1763sub decay_objects { 1994sub decay_objects {
1764 my ($self) = @_; 1995 my ($self) = @_;
1765 1996
1847 2078
1848sub find; 2079sub find;
1849sub find { 2080sub find {
1850 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1851 2082
2083 cf::cede_to_tick;
2084
1852 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1853 2086
1854 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1856 2089
1857 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1861 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1862 or return; 2092 or return;
1863 2093
1864 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1865 2095
1867 or return; 2097 or return;
1868 2098
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
1872 undef $guard1; 2103 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2104 $map->reset;
1875 return find $path; 2105 return find $path;
1876 } 2106 }
1877 2107
1878 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1879 } 2109 }
1880} 2110}
1881 2111
1882sub pre_load { } 2112sub pre_load { }
1883sub post_load { } 2113#sub post_load { } # XS
1884 2114
1885sub load { 2115sub load {
1886 my ($self) = @_; 2116 my ($self) = @_;
1887 2117
1888 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2135 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2136 $f->skip_block;
1907 $self->_load_objects ($f) 2137 $self->_load_objects ($f)
1908 or return; 2138 or return;
1909 2139
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1911 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1912 2142
1913 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2144 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2145 unless (aio_stat $uniq) {
1933 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1934 $self->decay_objects; 2164 $self->decay_objects;
1935 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1936 $self->update_buttons; 2166 $self->update_buttons;
1937 cf::cede_to_tick; 2167 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1940 $self->activate; 2168 $self->activate;
1941 } 2169 }
1942 2170
1943 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
1945 2173
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2175 }
1948 2176
1949 $self->post_load; 2177 $self->post_load;
1950}
1951 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1952sub customise_for { 2185sub customise_for {
1953 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1954 2187
1955 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1956 if $self->per_player; 2189 if $self->per_player;
1972 or next; 2205 or next;
1973 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
1974 or next; 2207 or next;
1975 $neigh->load; 2208 $neigh->load;
1976 2209
2210 # now find the diagonal neighbours
1977 push @neigh, 2211 push @neigh,
1978 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1979 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1980 } 2214 }
1981 2215
1988} 2222}
1989 2223
1990sub find_sync { 2224sub find_sync {
1991 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
1992 2226
1993 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
1994} 2231}
1995 2232
1996sub do_load_sync { 2233sub do_load_sync {
1997 my ($map) = @_; 2234 my ($map) = @_;
1998 2235
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2001 2238
2002 cf::sync_job { $map->load }; 2239 $map->load;
2003} 2240}
2004 2241
2005our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2006our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2007 2244
2009 my ($path, $origin, $load) = @_; 2246 my ($path, $origin, $load) = @_;
2010 2247
2011 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
2012 2249
2013 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2252 }
2016 2253
2017 $MAP_PREFETCH{$path} |= $load; 2254 $MAP_PREFETCH{$path} |= $load;
2018 2255
2019 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
2020 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2261 if (my $map = find $k) {
2023 $map->load if $v; 2262 $map->load if $v;
2024 } 2263 }
2031 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2032 2271
2033 () 2272 ()
2034} 2273}
2035 2274
2275# common code, used by both ->save and ->swapout
2036sub save { 2276sub _save {
2037 my ($self) = @_; 2277 my ($self) = @_;
2038
2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
2040 2278
2041 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2042 2280
2043 return unless $self->dirty; 2281 return unless $self->dirty;
2044 2282
2050 return if $self->{deny_save}; 2288 return if $self->{deny_save};
2051 2289
2052 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
2053 2291
2054 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2056 }; 2295 };
2296
2297 cf::get_slot 0.02;
2057 2298
2058 if ($uniq) { 2299 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2302 } else {
2062 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2063 } 2304 }
2064} 2305}
2065 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2066sub swap_out { 2315sub swap_out {
2067 my ($self) = @_; 2316 my ($self) = @_;
2068 2317
2069 # save first because save cedes
2070 $self->save;
2071
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2074 return if $self->players; 2322 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save};
2077 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2079 2374
2080 $self->deactivate; 2375 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2082 $self->clear; 2377 $self->clear;
2083}
2084
2085sub reset_at {
2086 my ($self) = @_;
2087
2088 # TODO: safety, remove and allow resettable per-player maps
2089 return 1e99 if $self->{deny_reset};
2090
2091 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2092 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2093
2094 $time + $to
2095}
2096
2097sub should_reset {
2098 my ($self) = @_;
2099
2100 $self->reset_at <= $cf::RUNTIME
2101}
2102
2103sub reset {
2104 my ($self) = @_;
2105
2106 my $lock = cf::lock_acquire "map_data:$self->{path}";
2107
2108 return if $self->players;
2109
2110 warn "resetting map ", $self->path;
2111
2112 $self->in_memory (cf::MAP_SWAPPED);
2113
2114 # need to save uniques path
2115 unless ($self->{deny_save}) {
2116 my $uniq = $self->uniq_path; utf8::encode $uniq;
2117
2118 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2119 if $uniq;
2120 }
2121
2122 delete $cf::MAP{$self->path};
2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 $self->clear;
2127 2378
2128 $self->unlink_save; 2379 $self->unlink_save;
2129 $self->destroy; 2380 $self->destroy;
2130} 2381}
2131 2382
2139 2390
2140 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2141 2392
2142 $self->unlink_save; 2393 $self->unlink_save;
2143 2394
2144 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2145 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2146 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2147 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2149 2400
2198 2449
2199sub unique_maps() { 2450sub unique_maps() {
2200 [ 2451 [
2201 map { 2452 map {
2202 utf8::decode $_; 2453 utf8::decode $_;
2203 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2204 ? normalise $_ 2457 : normalise $_
2205 : ()
2206 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2207 ] 2459 ]
2208} 2460}
2209 2461
2210package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2211 2493
2212=back 2494=back
2213 2495
2214=head3 cf::object 2496=head3 cf::object
2215 2497
2219 2501
2220=over 4 2502=over 4
2221 2503
2222=item $ob->inv_recursive 2504=item $ob->inv_recursive
2223 2505
2224Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2225 2508
2226=cut 2509=cut
2227 2510
2228sub inv_recursive_; 2511sub inv_recursive_;
2229sub inv_recursive_ { 2512sub inv_recursive_ {
2234 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2235} 2518}
2236 2519
2237=item $ref = $ob->ref 2520=item $ref = $ob->ref
2238 2521
2239creates and returns a persistent reference to an objetc that can be stored as a string. 2522Creates and returns a persistent reference to an object that can be stored as a string.
2240 2523
2241=item $ob = cf::object::deref ($refstring) 2524=item $ob = cf::object::deref ($refstring)
2242 2525
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block. 2527even if the object actually exists. May block.
2246=cut 2529=cut
2247 2530
2248sub deref { 2531sub deref {
2249 my ($ref) = @_; 2532 my ($ref) = @_;
2250 2533
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2535 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2537 or return;
2258 $pl->ob->uuid eq $uuid 2538 $pl->ob->uuid eq $uuid
2259 or return; 2539 or return;
2279can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2280dialogue with the given NPC character. 2560dialogue with the given NPC character.
2281 2561
2282=cut 2562=cut
2283 2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2577
2284# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2285# with dialog boxes. 2579# with dialog boxes.
2286#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2287sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2288 my ($self, $npc, $msg, $flags) = @_; 2582 my ($self, $npc, $msg, $flags) = @_;
2299 my $dialog = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301 2595
2302 } else { 2596 } else {
2303 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2304 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2305 } 2599 }
2306 } 2600 }
2307} 2601}
2308 2602
2309=item $object->send_msg ($channel, $msg, $color, [extra...]) 2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2334 2628
2335=item $player_object->enter_link 2629=item $player_object->enter_link
2336 2630
2337Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2338 2632
2339The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2340I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2341 2637
2342Will never block. 2638Will never block.
2343 2639
2344=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2345 2641
2365sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2366 my ($self) = @_; 2662 my ($self) = @_;
2367 2663
2368 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2369 2665
2666 ++$self->{_link_recursion};
2667
2370 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2371 2669
2372 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2373 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2374 2672
2375 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2376} 2674}
2377 2675
2378sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2379 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2380 2678
2397 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2398 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2399 2697
2400 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2401 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2402 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2403 2701
2404 $map->load; 2702 $map->load;
2405 $map->load_neighbours; 2703 $map->load_neighbours;
2406 2704
2407 return unless $self->contr->active; 2705 return unless $self->contr->active;
2408 $self->activate_recursive;
2409 2706
2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2411 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2412} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2413 2714
2715}
2716
2414=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2415 2718
2416Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2417her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2418that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2419the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2420be called at the end of this process. 2723be called at the end of this process.
2421 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2422=cut 2728=cut
2423 2729
2424our $GOTOGEN; 2730our $GOTOGEN;
2425 2731
2426sub cf::object::player::goto { 2732sub cf::object::player::goto {
2427 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2428 2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2740
2429 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2743
2432 $self->enter_link; 2744 $self->enter_link;
2433 2745
2434 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2749 # *tag paths override both path and x|y
2750 if ($path =~ /^\*(.*)$/) {
2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2752 my $ob = $obs[rand @obs];
2753
2754 # see if we actually can go there
2755 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2756 $ob = $obs[rand @obs];
2757 } else {
2758 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2759 }
2760 # else put us there anyways for now #d#
2761
2762 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2763 } else {
2764 ($path, $x, $y) = (undef, undef, undef);
2765 }
2766 }
2767
2435 my $map = eval { 2768 my $map = eval {
2436 my $map = cf::map::find $path; 2769 my $map = defined $path ? cf::map::find $path : undef;
2437 2770
2438 if ($map) { 2771 if ($map) {
2439 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2441 } else { 2774 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2776 }
2444 2777
2445 $map 2778 $map
2446 }; 2779 };
2447 2780
2453 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2454 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2455 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2456 } 2789 }
2457 2790
2458 $done->() if $done; 2791 $done->($self) if $done;
2459 })->prio (1); 2792 })->prio (1);
2460} 2793}
2461 2794
2462=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2463 2796
2483} 2816}
2484 2817
2485sub prepare_random_map { 2818sub prepare_random_map {
2486 my ($exit) = @_; 2819 my ($exit) = @_;
2487 2820
2488 my $guard = cf::lock_acquire "exit_prepare:$exit";
2489
2490 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2491 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2492 # that depends on the exit object 2823 # that depends on the exit object
2493 2824
2494 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2496 if ($exit->map) { 2827 if ($exit->map) {
2497 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2498 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2499 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2500 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2501 } 2834 }
2502 2835
2503 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2504 2837
2505 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2506 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2508 2841
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2511 undef $fh; 2844 undef $fh;
2512 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2513 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2514 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2515 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2516 } 2853 }
2517} 2854}
2518 2855
2519sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2520 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2521 2858
2522 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2523 2860
2524 if ($exit->slaying eq "/!") {
2525 #TODO: this should de-fi-ni-te-ly not be a sync-job
2526 # the problem is that $exit might not survive long enough
2527 # so it needs to be done right now, right here
2528 cf::sync_job { prepare_random_map $exit };
2529 }
2530
2531 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2532 my $hp = $exit->stats->hp;
2533 my $sp = $exit->stats->sp;
2534
2535 $self->enter_link; 2861 $self->enter_link;
2536 2862
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
2540
2541 (async { 2863 (async {
2542 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2543 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2544 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2545 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2546 1; 2887 1
2547 }) { 2888 }) {
2548 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2549 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2550 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2551 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2552 2893
2553 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2554 $self->leave_link; 2895 $self->leave_link;
2555 } 2896 }
2556 })->prio (1); 2897 })->prio (1);
2557} 2898}
2558 2899
2570sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2571 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2572 2913
2573 utf8::encode $text; 2914 utf8::encode $text;
2574 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2575} 2941}
2576 2942
2577=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2578 2944
2579Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2947the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2948the message unless the client supports the msg packet.
2583 2949
2584=cut 2950=cut
2585 2951
2952# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2587 "c/identify" => { 2960 "c/identify" => {
2588 id => "identify", 2961 id => "infobox",
2589 title => "Identify", 2962 title => "Identify",
2590 reply => undef, 2963 reply => undef,
2591 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2592 }, 2965 },
2593 "c/examine" => { 2966 "c/examine" => {
2594 id => "examine", 2967 id => "infobox",
2595 title => "Examine", 2968 title => "Examine",
2596 reply => undef, 2969 reply => undef,
2597 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2598 }, 2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2599); 3064);
2600 3065
2601sub cf::client::send_msg { 3066sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2603 3068
2604 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2605 3071
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 3073
2608 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3075 if ($CHANNEL{$channel}) {
3076 $channel = $CHANNEL{$channel};
2610 3077
3078 $self->ext_msg (channel_info => $channel);
3079 $channel = $channel->{id};
3080
2611 if (ref $channel) { 3081 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2616 if $self->can_msg;
2617 } 3086 }
2618 3087
2619 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2620 } 3089 }
2621 3090
2622 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2623 3092
2624 if ($self->can_msg) {
2625 # default colour, mask it out 3093 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2628 3096
2629 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2631 } else { 3100 );
2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642 3101
2643 $color &= cf::NDI_COLOR_MASK; 3102 $self->send_big_packet ($pkt);
2644
2645 utf8::encode $msg;
2646
2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2650 } else {
2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2652 $self->send_packet ("drawinfo $color $msg")
2653 }
2654 }
2655 }
2656} 3103}
2657 3104
2658=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2659 3106
2660Sends an ext event to the client. 3107Sends an ext event to the client.
2663 3110
2664sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2665 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2666 3113
2667 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2670 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 } 3119 }
2673} 3120}
2674 3121
2675=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2676 3123
2680 3127
2681sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2683 3130
2684 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove 3134 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2690 } 3137 }
2691} 3138}
2692 3139
2693=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2694 3141
2765 3212
2766 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2767 if $reply; 3214 if $reply;
2768 3215
2769 } else { 3216 } else {
2770 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2771 } 3218 }
2772 3219
2773 cf::override; 3220 cf::override;
2774 }, 3221 },
2775); 3222);
2795 3242
2796 $coro 3243 $coro
2797} 3244}
2798 3245
2799cf::client->attach ( 3246cf::client->attach (
2800 on_destroy => sub { 3247 on_client_destroy => sub {
2801 my ($ns) = @_; 3248 my ($ns) = @_;
2802 3249
2803 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2804 }, 3251 },
2805); 3252);
2821our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2822 3269
2823$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2824 3271
2825$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
2826 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
2827 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
2828 sort time 3275 sort time
2829)); 3276));
2830 3277
2831# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2833=pod 3280=pod
2834 3281
2835The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2836 3283
2837 cf::object 3284 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3285 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3286 insert remove name archname title slaying race decrease split
3287 value
2840 3288
2841 cf::object::player 3289 cf::object::player
2842 player 3290 player
2843 3291
2844 cf::player 3292 cf::player
2849 3297
2850=cut 3298=cut
2851 3299
2852for ( 3300for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
2855 decrease_ob_nr)], 3303 decrease split destroy change_exp value msg lore send_msg)],
2856 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2858 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2859) { 3307) {
2860 no strict 'refs';
2861 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2862 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2863 for @funs; 3310 for @funs;
2864} 3311}
2865 3312
2880 3327
2881 my $qcode = $code; 3328 my $qcode = $code;
2882 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2883 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2884 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2885 local $_; 3335 local $_;
2886 local @safe::cf::_safe_eval_args = values %vars;
2887 3336
2888 my $eval = 3337 my $eval =
2889 "do {\n" 3338 "do {\n"
2890 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2891 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2892 . $code 3341 . $code
2893 . "\n}" 3342 . "\n}"
2894 ; 3343 ;
2895 3344
3345 if ($CFG{safe_eval}) {
2896 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2897 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2898 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2899 3354
2900 if ($@) { 3355 if ($@) {
2901 warn "$@"; 3356 warn "$@",
2902 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2903 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2904 } 3359 }
2905 3360
2906 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2907} 3362}
2908 3363
2922=cut 3377=cut
2923 3378
2924sub register_script_function { 3379sub register_script_function {
2925 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2926 3381
2927 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2928 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2929} 3384}
2930 3385
2931=back 3386=back
2932 3387
2933=cut 3388=cut
2942 # for this (global event?) 3397 # for this (global event?)
2943 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
2944 3399
2945 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2946 3401
2947 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2948 3403
2949 my $facedata;
2950 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2951 or die "$path: $!"; 3405 or die "$path: $!";
2952 3406
2953 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
2954 3408
2955 $facedata->{version} == 2 3409 $facedata->{version} == 2
2956 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
2957 3411
2958 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2959 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC, 3415 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
2962 }; 3418 };
2963 cf::cede_to_tick; 3419 cf::cede_to_tick;
2964 3420
2965 { 3421 {
2966 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
2967 3423
2968 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
2970 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2974 3432
2975 cf::cede_to_tick; 3433 cf::cede_to_tick;
2976 } 3434 }
2977 3435
2978 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3437 next unless $info->{smooth};
3438
2980 my $idx = cf::face::find $face 3439 my $idx = cf::face::find $face
2981 or next; 3440 or next;
3441
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3445 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
2987 } 3447 }
2988 3448
2989 cf::cede_to_tick; 3449 cf::cede_to_tick;
2990 } 3450 }
2991 } 3451 }
3000 3460
3001 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3002 } 3462 }
3003 3463
3004 { 3464 {
3005 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3008 3466
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3468 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
3014 3470
3015 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3016 # prepend meta info 3472 cf::face::set_type $idx, $info->{type};
3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
3023 $data = pack "(w/a*)*", $meta, $info->{data};
3024 } else { 3473 } else {
3025 $data = $info->{data}; 3474 $RESOURCE{$name} = $info; # unused
3026 } 3475 }
3027 3476
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick; 3477 cf::cede_to_tick;
3032 } 3478 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 } 3479 }
3480
3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3482
3053 1 3483 1
3054} 3484}
3055 3485
3056register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3058 3488
3059 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v); 3490 $ns->fx_want ($k, $v);
3061 } 3491 }
3062}; 3492};
3493
3494sub load_resource_file($) {
3495 my $guard = lock_acquire "load_resource_file";
3496
3497 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100;
3499 cf::arch::commit_load;
3500
3501 $status
3502}
3063 3503
3064sub reload_regions { 3504sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework 3505 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?) 3506 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = (); 3507 %ext::player_env::MUSIC_FACE_CACHE = ();
3081} 3521}
3082 3522
3083sub reload_archetypes { 3523sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes" 3524 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n"; 3525 or die "unable to load archetypes\n";
3086 #d# NEED to laod twice to resolve forward references
3087 # this really needs to be done in an extra post-pass
3088 # (which needs to be synchronous, so solve it differently)
3089 load_resource_file "$DATADIR/archetypes"
3090 or die "unable to load archetypes\n";
3091} 3526}
3092 3527
3093sub reload_treasures { 3528sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3096} 3531}
3097 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3098sub reload_resources { 3556sub reload_resources {
3099 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3100 3558
3559 reload_exp_table;
3560 reload_materials;
3561 reload_facedata;
3562 reload_sound;
3563 reload_archetypes;
3101 reload_regions; 3564 reload_regions;
3102 reload_facedata;
3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures; 3565 reload_treasures;
3106 3566
3107 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3108}
3109
3110sub init {
3111 reload_resources;
3112} 3568}
3113 3569
3114sub reload_config { 3570sub reload_config {
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3116 or return;
3117 3572
3118 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3119 *CFG = YAML::Syck::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3120 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3122 3580
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3124 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3125 3583
3126 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3130 }; 3588 };
3131 warn $@ if $@; 3589 warn $@ if $@;
3132 } 3590 }
3133} 3591}
3134 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3135sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
3136 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3634 (async {
3140 Event::one_event; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
3142 }; 3638 };
3143 3639
3640 evthread_start IO::AIO::poll_fileno;
3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3144 reload_config; 3652 reload_config;
3145 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
3146 load_extensions; 3663 load_extensions;
3147 3664
3148 $TICK_WATCHER->start; 3665 utime time, time, $RUNTIMEFILE;
3149 Event::loop; 3666
3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3150} 3683}
3151 3684
3152############################################################################# 3685#############################################################################
3153# initialisation and cleanup 3686# initialisation and cleanup
3154 3687
3155# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3156BEGIN { 3689BEGIN {
3690 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3159 reentrant => 0,
3160 data => WF_AUTOCANCEL,
3161 signal => $signal,
3162 prio => 0,
3163 cb => sub {
3164 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3165 },
3166 ); 3694 };
3167 } 3695 }
3168} 3696}
3169 3697
3170sub write_runtime { 3698sub write_runtime_sync {
3171 my $runtime = "$LOCALDIR/runtime"; 3699 my $t0 = AE::time;
3172 3700
3173 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3175 3703
3176 IO::AIO::aio_utime $runtime, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3177 3705
3178 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3179 3707
3180 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3181 or return; 3709 or return;
3182 3710
3183 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3184 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3185 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3195 aio_utime $fh, undef, undef; 3723 aio_utime $fh, undef, undef;
3196 3724
3197 close $fh 3725 close $fh
3198 or return; 3726 or return;
3199 3727
3200 aio_rename "$runtime~", $runtime 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3201 and return; 3729 and return;
3202 3730
3203 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3204 3732
3205 1 3733 1
3734}
3735
3736our $uuid_lock;
3737our $uuid_skip;
3738
3739sub write_uuid_sync($) {
3740 $uuid_skip ||= $_[0];
3741
3742 return if $uuid_lock;
3743 local $uuid_lock = 1;
3744
3745 my $uuid = "$LOCALDIR/uuid";
3746
3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3748 or return;
3749
3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3758 $uuid_skip = 0;
3759
3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3761 and return;
3762
3763 # always fsync - this file is important
3764 aio_fsync $fh
3765 and return;
3766
3767 close $fh
3768 or return;
3769
3770 aio_rename "$uuid~", $uuid
3771 and return;
3772
3773 trace "uuid file written ($value).\n";
3774
3775 1
3776
3777}
3778
3779sub write_uuid($$) {
3780 my ($skip, $sync) = @_;
3781
3782 $sync ? write_uuid_sync $skip
3783 : async { write_uuid_sync $skip };
3206} 3784}
3207 3785
3208sub emergency_save() { 3786sub emergency_save() {
3209 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3210 3788
3211 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3212 3795
3213 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3214 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3215 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3216 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3218 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3805 $pl->valid or next;
3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3807 $pl->save;
3222 } 3808 }
3223 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3224 3810
3225 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3226 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3227 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3228 $map->valid or next; 3816 $map->valid or next;
3229 $map->save; 3817 $map->save;
3230 } 3818 }
3231 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3232 3820
3233 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3234 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3235 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3826
3827 info "emergency_perl_save: begin write uuid\n";
3828 write_uuid_sync 1;
3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3236 }; 3849 };
3237 3850
3238 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3239} 3852}
3240 3853
3241sub post_cleanup { 3854sub post_cleanup {
3242 my ($make_core) = @_; 3855 my ($make_core) = @_;
3243 3856
3857 IO::AIO::flush;
3858
3244 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3245 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3864}
3865
3866# a safer delete_package, copied from Symbol
3867sub clear_package($) {
3868 my $pkg = shift;
3869
3870 # expand to full symbol table name if needed
3871 unless ($pkg =~ /^main::.*::$/) {
3872 $pkg = "main$pkg" if $pkg =~ /^::/;
3873 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3874 $pkg .= '::' unless $pkg =~ /::$/;
3875 }
3876
3877 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3878 my $stem_symtab = *{$stem}{HASH};
3879
3880 defined $stem_symtab and exists $stem_symtab->{$leaf}
3881 or return;
3882
3883 # clear all symbols
3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3885 for my $name (keys %$leaf_symtab) {
3886 _gv_clear *{"$pkg$name"};
3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3888 }
3246} 3889}
3247 3890
3248sub do_reload_perl() { 3891sub do_reload_perl() {
3249 # can/must only be called in main 3892 # can/must only be called in main
3250 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3251 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3252 return; 3895 return;
3253 } 3896 }
3254 3897
3255 warn "reloading..."; 3898 return if $RELOAD++;
3256 3899
3257 warn "entering sync_job"; 3900 my $t1 = AE::time;
3258 3901
3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3905
3906 trace "perl_reload: entering sync_job";
3907
3259 cf::sync_job { 3908 cf::sync_job {
3260 cf::write_runtime; # external watchdog should not bark
3261 cf::emergency_save; 3909 #cf::emergency_save;
3262 cf::write_runtime; # external watchdog should not bark
3263 3910
3264 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV;
3266
3267 # if anything goes wrong in here, we should simply crash as we already saved
3268
3269 warn "cancelling all WF_AUTOCANCEL watchers";
3270 for (Event::all_watchers) {
3271 $_->cancel if $_->data & WF_AUTOCANCEL;
3272 }
3273
3274 warn "flushing outstanding aio requests";
3275 for (;;) {
3276 BDB::flush;
3277 IO::AIO::flush;
3278 Coro::cede;
3279 last unless IO::AIO::nreqs || BDB::nreqs;
3280 warn "iterate...";
3281 }
3282
3283 ++$RELOAD;
3284
3285 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3286 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3287 %EXT_CORO = (); 3913 %EXT_CORO = ();
3288 3914
3289 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3290 %COMMAND = (); 3916 %COMMAND = ();
3291 3917
3292 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3293 %EXTCMD = (); 3919 %EXTCMD = ();
3294 %EXTICMD = (); 3920 %EXTICMD = ();
3295 3921
3296 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3297 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3298 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3299 3925
3300 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3301 eval { 3927 eval {
3302 $cb->($pkg); 3928 $cb->($pkg);
3303 1 3929 1
3304 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3931 }
3932
3933 trace "... clearing $pkg";
3934 clear_package $pkg;
3305 } 3935 }
3306 3936
3307 warn "... nuking $pkg";
3308 Symbol::delete_package $pkg;
3309 }
3310
3311 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3312 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3313 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3314 3940
3315 warn "... unloading $k"; 3941 trace "... unloading $k";
3316 delete $INC{$k}; 3942 delete $INC{$k};
3317 3943
3318 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3319 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3320 3946
3321 if (my $cb = $k->can ("unload_module")) { 3947 if (my $cb = $k->can ("unload_module")) {
3322 $cb->(); 3948 $cb->();
3949 }
3950
3951 clear_package $k;
3323 } 3952 }
3324 3953
3325 Symbol::delete_package $k;
3326 }
3327
3328 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3329 Symbol::delete_package "safe::$_" 3955 clear_package "safe::$_"
3330 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3331 3957
3332 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3333 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3334 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3335 3961
3336 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3337 # and global variables created in xs 3963 # and global variables created in xs
3338 #Symbol::delete_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3339 3965
3340 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3341 3967
3342 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3343 require cf; 3969 require cf;
3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3345 3971
3346 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3347 cf::reload_config; 3973 cf::reload_config;
3348 3974
3349 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3350 cf::load_extensions; 3976 cf::load_extensions;
3351 3977
3978 if ($REATTACH_ON_RELOAD) {
3352 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3353 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3354 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3355 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3356 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3357 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3358 3986
3359 warn "leaving sync_job"; 3987 cf::_post_init 1;
3360 3988
3989 trace "perl_reload: leaving sync_job";
3990
3361 1 3991 1
3362 } or do { 3992 } or do {
3363 warn $@; 3993 error $@;
3364 warn "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3365 exit 1; 3995 };
3996
3997 --$RELOAD;
3366 }; 3998 }
3367 3999
3368 warn "reloaded"; 4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3369}; 4002};
3370 4003
3371our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3372 4005
3373sub reload_perl() { 4006sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3376 4009
3377 $RELOAD_WATCHER ||= Event->timer ( 4010 $RELOAD_WATCHER ||= cf::async {
3378 reentrant => 0, 4011 Coro::AIO::aio_wait cache_extensions;
3379 after => 0, 4012
3380 data => WF_AUTOCANCEL, 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3381 cb => sub {
3382 do_reload_perl; 4014 do_reload_perl;
3383 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3384 }, 4016 };
3385 ); 4017 };
3386} 4018}
3387 4019
3388register_command "reload" => sub { 4020register_command "reload" => sub {
3389 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3390 4022
3391 if ($who->flag (FLAG_WIZ)) { 4023 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 4024 $who->message ("reloading server.");
4025 async {
4026 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 4027 reload_perl;
4028 };
3394 } 4029 }
3395}; 4030};
3396 4031
3397unshift @INC, $LIBDIR; 4032#############################################################################
3398 4033
3399my $bug_warning = 0; 4034my $bug_warning = 0;
3400 4035
3401our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3403 4038
3404sub wait_for_tick { 4039sub wait_for_tick() {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3407 4041
3408 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait; 4044 $signal->wait;
3411} 4045}
3412 4046
3413sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3416 4049
3417 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 4052 $signal->wait;
3420} 4053}
3421 4054
3422 my $min = 1e6;#d# 4055sub tick {
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer (
3425 reentrant => 0,
3426 parked => 1,
3427 prio => 0,
3428 at => $NEXT_TICK || $TICK,
3429 data => WF_AUTOCANCEL,
3430 cb => sub {
3431 if ($Coro::current != $Coro::main) { 4056 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 4058 unless ++$bug_warning > 10;
3434 return; 4059 return;
3435 } 4060 }
3436 4061
3437 $NOW = $tick_start = Event::time;
3438
3439 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3440 4063
3441 0 && sync_job {#d# 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3442 for(1..10) {
3443 my $t = Event::time;
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3445 or die;
3446 4065
3447 $map->width (50); 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3448 $map->height (50); 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3449 $map->alloc; 4068 Coro::async_pool {
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4069 $Coro::current->{desc} = "runtime saver";
3451 my $t = Event::time - $t; 4070 write_runtime_sync
3452 4071 or error "ERROR: unable to write runtime file: $!";
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 }; 4072 };
4073 }
3463 4074
3464 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK;
3466
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool {
3470 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!";
3472 };
3473 }
3474
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 4076 $sig->send;
3480 } 4077 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 4078 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 4079 $sig->send;
3483 } 4080 }
3484 4081
3485 $NOW = Event::time; 4082 $LOAD = ($NOW - $TICK_START) / $TICK;
3486
3487 # if we are delayed by four ticks or more, skip them all
3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3489
3490 $TICK_WATCHER->at ($NEXT_TICK);
3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 4084
3496 _post_tick; 4085 if (0) {
3497 4086 if ($NEXT_TICK) {
3498 4087 my $jitter = $TICK_START - $NEXT_TICK;
4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4089 debug "jitter $JITTER\n";#d#
4090 }
3499 }, 4091 }
3500); 4092}
3501 4093
3502{ 4094{
3503 BDB::max_poll_time $TICK * 0.1; 4095 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 4096
3505 reentrant => 0,
3506 fd => BDB::poll_fileno,
3507 poll => 'r',
3508 prio => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb,
3511 );
3512 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3513 4098 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 4099 $AnyEvent::BDB::WATCHER->priority (1);
3515 my $status;
3516 my $current = $Coro::current;
3517 (
3518 sub {
3519 $status = $!;
3520 $current->ready; undef $current;
3521 },
3522 sub {
3523 Coro::schedule while defined $current;
3524 $! = $status;
3525 },
3526 )
3527 };
3528 4100
3529 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4105 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4106 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4107 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 4108
3532 cf::sync_job { 4109 cf::sync_job {
3533 eval { 4110 eval {
3534 BDB::db_env_open 4111 BDB::db_env_open
3535 $DB_ENV, 4112 $DB_ENV,
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4114 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4115 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 4116 0666;
3540 4117
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4118 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 4119 };
3546 4120
3547 cf::cleanup "db_env_open(db): $@" if $@; 4121 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 4122 };
3549 } 4123 }
4124
4125 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4126 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4127 };
4128 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 };
3550} 4134}
3551 4135
3552{ 4136{
4137 # configure IO::AIO
4138
3553 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 4141 undef $AnyEvent::AIO::WATCHER;
3558 reentrant => 0,
3559 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno,
3561 poll => 'r',
3562 prio => 6,
3563 cb => \&IO::AIO::poll_cb,
3564 );
3565} 4142}
3566 4143
3567my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3568 4146
3569sub _log_backtrace { 4147sub _log_backtrace {
3570 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3571 4149
3572 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3573 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3574 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3576 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3577 async { 4160 async {
4161 $Coro::current->{desc} = "abt $msg";
4162
3578 my @bt = fork_call { 4163 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4165 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4166 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 4167 or die "addr2line: $!";
3590 } 4175 }
3591 4176
3592 @funcs 4177 @funcs
3593 }; 4178 };
3594 4179
3595 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3596 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3597 --$_log_backtrace; 4183 --$_log_backtrace;
3598 }; 4184 };
3599 } else { 4185 } else {
3600 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3601 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3602 } 4188 }
3603} 4189}
3604 4190
3605# load additional modules 4191# load additional modules
3606use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3607 4194
3608END { cf::emergency_save } 4195END { cf::emergency_save }
3609 4196
36101 41971
3611 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines