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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines