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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines