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.333 by root, Sun Aug 19 09:14:50 2007 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 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
1505=cut 1790=cut
1506 1791
1507sub ext_reply($$@) { 1792sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1793 my ($self, $id, @msg) = @_;
1509 1794
1510 if ($self->ns->extcmd == 2) { 1795 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1796}
1518 1797
1519=item $player->ext_msg ($type, @msg) 1798=item $player->ext_msg ($type, @msg)
1520 1799
1521Sends an ext event to the client. 1800Sends an ext event to the client.
1542 1821
1543=cut 1822=cut
1544 1823
1545sub find_by_path($) { 1824sub find_by_path($) {
1546 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1547 1828
1548 my ($match, $specificity); 1829 my ($match, $specificity);
1549 1830
1550 for my $region (list) { 1831 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1577our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1579 1860
1580sub generate_random_map { 1861sub generate_random_map {
1581 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1582 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1583 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1587 $rmp->{exit_on_final_map},
1588 $rmp->{xsize}, $rmp->{ysize},
1589 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1590 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1591 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1592 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1593 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1594 (cf::region::find $rmp->{region}), $rmp->{custom}
1595 )
1596} 1867}
1597 1868
1598=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1599 1870
1600Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1605 1876
1606sub register { 1877sub register {
1607 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1608 my $pkg = caller; 1879 my $pkg = caller;
1609 1880
1610 no strict;
1611 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1612 1882
1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1614} 1884}
1615 1885
1616# also paths starting with '/' 1886# also paths starting with '/'
1617$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1618 1888
1619sub thawer_merge { 1889sub thawer_merge {
1620 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1621 1891
1622 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1627} 1897}
1628 1898
1629sub normalise { 1899sub normalise {
1630 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1631 1901
1632 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1633 1903
1634 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1635 1905
1636 # map plan: 1906 # map plan:
1637 # 1907 #
1652 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1653 $path = "$base/$path"; 1923 $path = "$base/$path";
1654 } 1924 }
1655 1925
1656 for ($path) { 1926 for ($path) {
1657 redo if s{//}{/};
1658 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1659 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1660 } 1929 }
1661 1930
1662 $path 1931 $path
1676 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1677 return $self; 1946 return $self;
1678 } 1947 }
1679 } 1948 }
1680 1949
1681 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1682 () 1951 ()
1683} 1952}
1684 1953
1685sub init { 1954sub init {
1686 my ($self) = @_; 1955 my ($self) = @_;
1708 1977
1709# the temporary/swap location 1978# the temporary/swap location
1710sub save_path { 1979sub save_path {
1711 my ($self) = @_; 1980 my ($self) = @_;
1712 1981
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1715} 1984}
1716 1985
1717# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1718sub uniq_path { 1987sub uniq_path {
1719 my ($self) = @_; 1988 my ($self) = @_;
1720 1989
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1992}
1733 1993
1734sub decay_objects { 1994sub decay_objects {
1735 my ($self) = @_; 1995 my ($self) = @_;
1736 1996
1749 2009
1750sub load_header_from($) { 2010sub load_header_from($) {
1751 my ($self, $path) = @_; 2011 my ($self, $path) = @_;
1752 2012
1753 utf8::encode $path; 2013 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 2014 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 2015 or return;
2016
2017 $self->_load_header ($f)
2018 or return;
2019
2020 local $MAP_LOADING{$self->{path}} = $self;
2021 $f->resolve_delayed_derefs;
1759 2022
1760 $self->{load_path} = $path; 2023 $self->{load_path} = $path;
1761 2024
1762 1 2025 1
1763} 2026}
1815 2078
1816sub find; 2079sub find;
1817sub find { 2080sub find {
1818 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1819 2082
2083 cf::cede_to_tick;
2084
1820 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1821 2086
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2089
1824 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1827 or return; 2092 or return;
1828 2093
1829 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1830 2095
1832 or return; 2097 or return;
1833 2098
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
2103 undef $guard1;
1837 $map->reset; 2104 $map->reset;
1838 undef $guard;
1839 return find $path; 2105 return find $path;
1840 } 2106 }
1841 2107
1842 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1843 } 2109 }
1844} 2110}
1845 2111
1846sub pre_load { } 2112sub pre_load { }
1847sub post_load { } 2113#sub post_load { } # XS
1848 2114
1849sub load { 2115sub load {
1850 my ($self) = @_; 2116 my ($self) = @_;
1851 2117
1852 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1853 2119
1854 my $path = $self->{path}; 2120 my $path = $self->{path};
1855 2121
1856 { 2122 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2123 my $guard = cf::lock_acquire "map_data:$path";
1858 2124
2125 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2126 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2127
1861 $self->in_memory (cf::MAP_LOADING); 2128 $self->in_memory (cf::MAP_LOADING);
1862 2129
1863 $self->alloc; 2130 $self->alloc;
1864 2131
1865 $self->pre_load; 2132 $self->pre_load;
1866 Coro::cede; 2133 cf::cede_to_tick;
1867 2134
2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2137 $self->_load_objects ($f)
1869 or return; 2138 or return;
1870 2139
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1872 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1873 2142
1874 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2144 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2145 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2147 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2148 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs;
2150 }
1879 } 2151 }
1880 } 2152 }
1881 2153
1882 Coro::cede; 2154 $f->resolve_delayed_derefs;
2155
2156 cf::cede_to_tick;
1883 # now do the right thing for maps 2157 # now do the right thing for maps
1884 $self->link_multipart_objects; 2158 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2159 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2160 unless $self->difficulty;
1887 Coro::cede; 2161 cf::cede_to_tick;
1888 2162
1889 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2164 $self->decay_objects;
1891 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1892 $self->update_buttons; 2166 $self->update_buttons;
1893 Coro::cede; 2167 cf::cede_to_tick;
1894 $self->set_darkness_map;
1895 Coro::cede;
1896 $self->activate; 2168 $self->activate;
1897 } 2169 }
1898 2170
1899 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
1901 2173
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2175 }
1904 2176
1905 $self->post_load; 2177 $self->post_load;
1906}
1907 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1908sub customise_for { 2185sub customise_for {
1909 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1910 2187
1911 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1912 if $self->per_player; 2189 if $self->per_player;
1928 or next; 2205 or next;
1929 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
1930 or next; 2207 or next;
1931 $neigh->load; 2208 $neigh->load;
1932 2209
2210 # now find the diagonal neighbours
1933 push @neigh, 2211 push @neigh,
1934 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1935 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1936 } 2214 }
1937 2215
1944} 2222}
1945 2223
1946sub find_sync { 2224sub find_sync {
1947 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
1948 2226
1949 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
1950} 2231}
1951 2232
1952sub do_load_sync { 2233sub do_load_sync {
1953 my ($map) = @_; 2234 my ($map) = @_;
1954 2235
1955 cf::sync_job { $map->load }; 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main;
2238
2239 $map->load;
1956} 2240}
1957 2241
1958our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
1960 2244
1961sub find_async { 2245sub find_async {
1962 my ($path, $origin) = @_; 2246 my ($path, $origin, $load) = @_;
1963 2247
1964 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
1965 2249
1966 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2252 }
1969 2253
1970 undef $MAP_PREFETCH{$path}; 2254 $MAP_PREFETCH{$path} |= $load;
2255
1971 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
1972 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 2261 if (my $map = find $k) {
1975 $map->load; 2262 $map->load if $v;
1976 } 2263 }
1977 2264
1978 delete $MAP_PREFETCH{$path}; 2265 delete $MAP_PREFETCH{$k};
1979 } 2266 }
1980 } 2267 }
1981 undef $MAP_PREFETCHER; 2268 undef $MAP_PREFETCHER;
1982 }; 2269 };
1983 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
1984 2271
1985 () 2272 ()
1986} 2273}
1987 2274
2275# common code, used by both ->save and ->swapout
1988sub save { 2276sub _save {
1989 my ($self) = @_; 2277 my ($self) = @_;
1990
1991 my $lock = cf::lock_acquire "map_data:" . $self->path;
1992 2278
1993 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
1994 2280
1995 return unless $self->dirty; 2281 return unless $self->dirty;
1996 2282
2002 return if $self->{deny_save}; 2288 return if $self->{deny_save};
2003 2289
2004 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
2005 2291
2006 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
2007 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2008 }; 2295 };
2296
2297 cf::get_slot 0.02;
2009 2298
2010 if ($uniq) { 2299 if ($uniq) {
2011 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2012 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2013 } else { 2302 } else {
2014 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2015 } 2304 }
2016} 2305}
2017 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2018sub swap_out { 2315sub swap_out {
2019 my ($self) = @_; 2316 my ($self) = @_;
2020 2317
2021 # save first because save cedes
2022 $self->save;
2023
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2026 return if $self->players; 2322 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY;
2028 return if $self->{deny_save};
2029 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2030 $self->clear; 2333 $self->clear;
2031 $self->in_memory (cf::MAP_SWAPPED);
2032} 2334}
2033 2335
2034sub reset_at { 2336sub reset_at {
2035 my ($self) = @_; 2337 my ($self) = @_;
2036 2338
2054 2356
2055 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2056 2358
2057 return if $self->players; 2359 return if $self->players;
2058 2360
2059 warn "resetting map ", $self->path; 2361 cf::trace "resetting map ", $self->path, "\n";
2060 2362
2061 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
2062 2364
2063 # need to save uniques path 2365 # need to save uniques path
2064 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
2068 if $uniq; 2370 if $uniq;
2069 } 2371 }
2070 2372
2071 delete $cf::MAP{$self->path}; 2373 delete $cf::MAP{$self->path};
2072 2374
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2073 $self->clear; 2377 $self->clear;
2074
2075 $_->clear_links_to ($self) for values %cf::MAP;
2076 2378
2077 $self->unlink_save; 2379 $self->unlink_save;
2078 $self->destroy; 2380 $self->destroy;
2079} 2381}
2080 2382
2081my $nuke_counter = "aaaa"; 2383my $nuke_counter = "aaaa";
2082 2384
2083sub nuke { 2385sub nuke {
2084 my ($self) = @_; 2386 my ($self) = @_;
2085 2387
2388 {
2389 my $lock = cf::lock_acquire "map_data:$self->{path}";
2390
2086 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2087 2392
2088 $self->unlink_save; 2393 $self->unlink_save;
2089 2394
2090 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2091 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2400
2096 $cf::MAP{$self->path} = $self; 2401 $cf::MAP{$self->path} = $self;
2402 }
2097 2403
2098 $self->reset; # polite request, might not happen 2404 $self->reset; # polite request, might not happen
2099} 2405}
2100 2406
2101=item $maps = cf::map::tmp_maps 2407=item $maps = cf::map::tmp_maps
2143 2449
2144sub unique_maps() { 2450sub unique_maps() {
2145 [ 2451 [
2146 map { 2452 map {
2147 utf8::decode $_; 2453 utf8::decode $_;
2148 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2149 ? normalise $_ 2457 : normalise $_
2150 : ()
2151 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2152 ] 2459 ]
2153} 2460}
2154 2461
2155package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2156 2493
2157=back 2494=back
2158 2495
2159=head3 cf::object 2496=head3 cf::object
2160 2497
2164 2501
2165=over 4 2502=over 4
2166 2503
2167=item $ob->inv_recursive 2504=item $ob->inv_recursive
2168 2505
2169Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2170 2508
2171=cut 2509=cut
2172 2510
2173sub inv_recursive_; 2511sub inv_recursive_;
2174sub inv_recursive_ { 2512sub inv_recursive_ {
2177 2515
2178sub inv_recursive { 2516sub inv_recursive {
2179 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2180} 2518}
2181 2519
2520=item $ref = $ob->ref
2521
2522Creates and returns a persistent reference to an object that can be stored as a string.
2523
2524=item $ob = cf::object::deref ($refstring)
2525
2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2527even if the object actually exists. May block.
2528
2529=cut
2530
2531sub deref {
2532 my ($ref) = @_;
2533
2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2535 my ($uuid, $name) = ($1, $2);
2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2537 or return;
2538 $pl->ob->uuid eq $uuid
2539 or return;
2540
2541 $pl->ob
2542 } else {
2543 warn "$ref: cannot resolve object reference\n";
2544 undef
2545 }
2546}
2547
2182package cf; 2548package cf;
2183 2549
2184=back 2550=back
2185 2551
2186=head3 cf::object::player 2552=head3 cf::object::player
2192Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2558Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2193can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2194dialogue with the given NPC character. 2560dialogue with the given NPC character.
2195 2561
2196=cut 2562=cut
2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2197 2577
2198# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2199# with dialog boxes. 2579# with dialog boxes.
2200#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2201sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2213 my $dialog = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2215 2595
2216 } else { 2596 } else {
2217 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2218 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2219 } 2599 }
2220 } 2600 }
2221} 2601}
2222 2602
2223=item $object->send_msg ($channel, $msg, $color, [extra...]) 2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2248 2628
2249=item $player_object->enter_link 2629=item $player_object->enter_link
2250 2630
2251Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2252 2632
2253The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2254I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2255 2637
2256Will never block. 2638Will never block.
2257 2639
2258=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2259 2641
2279sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2280 my ($self) = @_; 2662 my ($self) = @_;
2281 2663
2282 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2283 2665
2666 ++$self->{_link_recursion};
2667
2284 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2285 2669
2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2287 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2288 2672
2289 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2290} 2674}
2291 2675
2292sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2293 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2294 2678
2311 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2312 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2313 2697
2314 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2317 2701
2318 $map->load; 2702 $map->load;
2319 $map->load_neighbours; 2703 $map->load_neighbours;
2320 2704
2321 return unless $self->contr->active; 2705 return unless $self->contr->active;
2322 $self->activate_recursive;
2323 2706
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2325 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2326} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2327 2714
2715}
2716
2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2329 2718
2330Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2331her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2332that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2333the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2723be called at the end of this process.
2335 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2336=cut 2728=cut
2337 2729
2338our $GOTOGEN; 2730our $GOTOGEN;
2339 2731
2340sub cf::object::player::goto { 2732sub cf::object::player::goto {
2341 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2342 2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2740
2343 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2743
2346 $self->enter_link; 2744 $self->enter_link;
2347 2745
2348 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2749 # *tag paths override both path and x|y
2750 if ($path =~ /^\*(.*)$/) {
2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2752 my $ob = $obs[rand @obs];
2753
2754 # see if we actually can go there
2755 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2756 $ob = $obs[rand @obs];
2757 } else {
2758 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2759 }
2760 # else put us there anyways for now #d#
2761
2762 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2763 } else {
2764 ($path, $x, $y) = (undef, undef, undef);
2765 }
2766 }
2767
2349 my $map = eval { 2768 my $map = eval {
2350 my $map = cf::map::find $path; 2769 my $map = defined $path ? cf::map::find $path : undef;
2351 2770
2352 if ($map) { 2771 if ($map) {
2353 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2355 } else { 2774 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2776 }
2358 2777
2359 $map 2778 $map
2360 }; 2779 };
2361 2780
2367 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2369 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2370 } 2789 }
2371 2790
2372 $done->() if $done; 2791 $done->($self) if $done;
2373 })->prio (1); 2792 })->prio (1);
2374} 2793}
2375 2794
2376=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2377 2796
2397} 2816}
2398 2817
2399sub prepare_random_map { 2818sub prepare_random_map {
2400 my ($exit) = @_; 2819 my ($exit) = @_;
2401 2820
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2823 # that depends on the exit object
2407 2824
2408 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2827 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2415 } 2834 }
2416 2835
2417 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2418 2837
2419 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2422 2841
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2844 undef $fh;
2426 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2427 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2430 } 2853 }
2431} 2854}
2432 2855
2433sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2435 2858
2436 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2437 2860
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2861 $self->enter_link;
2450 2862
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2863 (async {
2456 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2457 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2458 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2459 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2460 1; 2887 1
2461 }) { 2888 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2463 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2466 2893
2467 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2468 $self->leave_link; 2895 $self->leave_link;
2469 } 2896 }
2470 })->prio (1); 2897 })->prio (1);
2471} 2898}
2472 2899
2484sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2485 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2486 2913
2487 utf8::encode $text; 2914 utf8::encode $text;
2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2489} 2941}
2490 2942
2491=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2492 2944
2493Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2947the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2948the message unless the client supports the msg packet.
2497 2949
2498=cut 2950=cut
2499 2951
2952# non-persistent channels (usually the info channel)
2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2960 "c/identify" => {
2961 id => "infobox",
2962 title => "Identify",
2963 reply => undef,
2964 tooltip => "Items recently identified",
2965 },
2966 "c/examine" => {
2967 id => "infobox",
2968 title => "Examine",
2969 reply => undef,
2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
3064);
3065
2500sub cf::client::send_msg { 3066sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2502 3068
2503 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2504 3071
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 3073
3074 # check predefined channels, for the benefit of C
3075 if ($CHANNEL{$channel}) {
3076 $channel = $CHANNEL{$channel};
3077
3078 $self->ext_msg (channel_info => $channel);
3079 $channel = $channel->{id};
3080
2507 if (ref $channel) { 3081 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 3085 $self->ext_msg (channel_info => $channel);
2512 } 3086 }
2514 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2515 } 3089 }
2516 3090
2517 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2518 3092
2519 if ($self->can_msg) {
2520 # default colour, mask it out 3093 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2523 3096
2524 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2526 } else { 3100 );
2527 if ($color >= 0) {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537 3101
2538 $color &= cf::NDI_COLOR_MASK; 3102 $self->send_big_packet ($pkt);
2539
2540 utf8::encode $msg;
2541
2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2545 } else {
2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2547 $self->send_packet ("drawinfo $color $msg")
2548 }
2549 }
2550 }
2551} 3103}
2552 3104
2553=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2554 3106
2555Sends an ext event to the client. 3107Sends an ext event to the client.
2557=cut 3109=cut
2558 3110
2559sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2561 3113
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 3114 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 3137 }
2570} 3138}
2571 3139
2572=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2573 3141
2634 my ($type, $reply, @payload) = 3202 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 3203 "ARRAY" eq ref $msg
2636 ? @$msg 3204 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 3206
3207 my @reply;
3208
2639 if (my $cb = $EXTICMD{$type}) { 3209 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 3210 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 3211 }
3212
3213 $ns->ext_reply ($reply, @reply)
3214 if $reply;
3215
2645 } else { 3216 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 3218 }
2648 3219
2649 cf::override; 3220 cf::override;
2650 }, 3221 },
2651); 3222);
2671 3242
2672 $coro 3243 $coro
2673} 3244}
2674 3245
2675cf::client->attach ( 3246cf::client->attach (
2676 on_destroy => sub { 3247 on_client_destroy => sub {
2677 my ($ns) = @_; 3248 my ($ns) = @_;
2678 3249
2679 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2680 }, 3251 },
2681); 3252);
2697our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2698 3269
2699$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2700 3271
2701$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
2703 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
2704 sort time 3275 sort time
2705)); 3276));
2706 3277
2707# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2709=pod 3280=pod
2710 3281
2711The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2712 3283
2713 cf::object 3284 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 3285 contr pay_amount pay_player map x y force_find force_add destroy
2715 insert remove name archname title slaying race 3286 insert remove name archname title slaying race decrease split
3287 value
2716 3288
2717 cf::object::player 3289 cf::object::player
2718 player 3290 player
2719 3291
2720 cf::player 3292 cf::player
2725 3297
2726=cut 3298=cut
2727 3299
2728for ( 3300for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 3302 insert remove inv nrof name archname title slaying race
3303 decrease split destroy change_exp value msg lore send_msg)],
2731 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2733 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2734) { 3307) {
2735 no strict 'refs';
2736 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2737 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2738 for @funs; 3310 for @funs;
2739} 3311}
2740 3312
2755 3327
2756 my $qcode = $code; 3328 my $qcode = $code;
2757 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2758 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2759 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2760 local $_; 3335 local $_;
2761 local @safe::cf::_safe_eval_args = values %vars;
2762 3336
2763 my $eval = 3337 my $eval =
2764 "do {\n" 3338 "do {\n"
2765 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2766 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2767 . $code 3341 . $code
2768 . "\n}" 3342 . "\n}"
2769 ; 3343 ;
2770 3344
3345 if ($CFG{safe_eval}) {
2771 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2772 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2773 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2774 3354
2775 if ($@) { 3355 if ($@) {
2776 warn "$@"; 3356 warn "$@",
2777 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2778 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2779 } 3359 }
2780 3360
2781 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2782} 3362}
2783 3363
2797=cut 3377=cut
2798 3378
2799sub register_script_function { 3379sub register_script_function {
2800 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2801 3381
2802 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2803 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2804} 3384}
2805 3385
2806=back 3386=back
2807 3387
2808=cut 3388=cut
2811# the server's init and main functions 3391# the server's init and main functions
2812 3392
2813sub load_facedata($) { 3393sub load_facedata($) {
2814 my ($path) = @_; 3394 my ($path) = @_;
2815 3395
3396 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?)
3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401
2816 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2817 3403
2818 my $facedata;
2819 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2820 or die "$path: $!"; 3405 or die "$path: $!";
2821 3406
2822 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
2823 3408
2824 $facedata->{version} == 2 3409 $facedata->{version} == 2
2825 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
2826 3411
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick;
3420
2827 { 3421 {
2828 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
2829 3423
2830 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
2831 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
2832 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
2833 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
2834 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2835 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2836 3431
2837 cf::cede_to_tick; 3432 cf::cede_to_tick;
2838 } 3433 }
2839 3434
2840 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
2841 next unless $info->{smooth}; 3436 next unless $info->{smooth};
3437
2842 my $idx = cf::face::find $face 3438 my $idx = cf::face::find $face
2843 or next; 3439 or next;
3440
2844 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
2845 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
2846 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2847 } else { 3444 } else {
2848 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
2849 } 3446 }
2850 3447
2851 cf::cede_to_tick; 3448 cf::cede_to_tick;
2852 } 3449 }
2853 } 3450 }
2862 3459
2863 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
2864 } 3461 }
2865 3462
2866 { 3463 {
2867 # TODO: for gcfclient pleasure, we should give resources
2868 # that gcfclient doesn't grok a >10000 face index.
2869 my $res = $facedata->{resource}; 3464 my $res = $facedata->{resource};
2870 my $enc = JSON::XS->new->utf8->canonical;
2871
2872 my $soundconf = delete $res->{"res/sound.conf"};
2873 3465
2874 while (my ($name, $info) = each %$res) { 3466 while (my ($name, $info) = each %$res) {
2875 my $meta = $enc->encode ({ 3467 if (defined $info->{type}) {
2876 name => $name,
2877 %{ $info->{meta} || {} },
2878 });
2879
2880 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2881 3469
2882 if ($info->{type} & 1) {
2883 # prepend meta info
2884
2885 my $data = pack "(w/a*)*", $meta, $info->{data};
2886 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2887
2888 cf::face::set_data $idx, 0, $data, $chk; 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3471 cf::face::set_type $idx, $info->{type};
2889 } else { 3472 } else {
2890 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3473 $RESOURCE{$name} = $info; # unused
2891 } 3474 }
2892 3475
2893 cf::face::set_type $idx, $info->{type};
2894
2895 cf::cede_to_tick; 3476 cf::cede_to_tick;
2896 } 3477 }
2897
2898 if ($soundconf) {
2899 $soundconf = $enc->decode (delete $soundconf->{data});
2900
2901 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2902 my $sound = $soundconf->{compat}[$_]
2903 or next;
2904
2905 my $face = cf::face::find "sound/$sound->[1]";
2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 }
2909
2910 while (my ($k, $v) = each %{$soundconf->{event}}) {
2911 my $face = cf::face::find "sound/$v";
2912 cf::sound::set $k => $face;
2913 }
2914 }
2915 } 3478 }
3479
3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2916 3481
2917 1 3482 1
2918} 3483}
2919 3484
2920register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
2923 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
2924 $ns->fx_want ($k, $v); 3489 $ns->fx_want ($k, $v);
2925 } 3490 }
2926}; 3491};
2927 3492
3493sub load_resource_file($) {
3494 my $guard = lock_acquire "load_resource_file";
3495
3496 my $status = load_resource_file_ $_[0];
3497 get_slot 0.1, 100;
3498 cf::arch::commit_load;
3499
3500 $status
3501}
3502
2928sub reload_regions { 3503sub reload_regions {
3504 # HACK to clear player env face cache, we need some signal framework
3505 # for this (global event?)
3506 %ext::player_env::MUSIC_FACE_CACHE = ();
3507
2929 load_resource_file "$MAPDIR/regions" 3508 load_resource_file "$MAPDIR/regions"
2930 or die "unable to load regions file\n"; 3509 or die "unable to load regions file\n";
2931 3510
2932 for (cf::region::list) { 3511 for (cf::region::list) {
2933 $_->{match} = qr/$_->{match}/ 3512 $_->{match} = qr/$_->{match}/
2941} 3520}
2942 3521
2943sub reload_archetypes { 3522sub reload_archetypes {
2944 load_resource_file "$DATADIR/archetypes" 3523 load_resource_file "$DATADIR/archetypes"
2945 or die "unable to load archetypes\n"; 3524 or die "unable to load archetypes\n";
2946 #d# NEED to laod twice to resolve forward references
2947 # this really needs to be done in an extra post-pass
2948 # (which needs to be synchronous, so solve it differently)
2949 load_resource_file "$DATADIR/archetypes"
2950 or die "unable to load archetypes\n";
2951} 3525}
2952 3526
2953sub reload_treasures { 3527sub reload_treasures {
2954 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
2955 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
2956} 3530}
2957 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
2958sub reload_resources { 3555sub reload_resources {
2959 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
2960 3557
3558 reload_exp_table;
3559 reload_materials;
3560 reload_facedata;
3561 reload_sound;
3562 reload_archetypes;
2961 reload_regions; 3563 reload_regions;
2962 reload_facedata;
2963 #reload_archetypes;#d#
2964 reload_archetypes;
2965 reload_treasures; 3564 reload_treasures;
2966 3565
2967 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
2968} 3567}
2969 3568
2970sub init { 3569sub reload_config {
2971 reload_resources; 3570 trace "reloading config file...\n";
2972}
2973 3571
2974sub cfg_load { 3572 0 < aio_load "$CONFDIR/config", my $config
2975 open my $fh, "<:utf8", "$CONFDIR/config" 3573 or die "$CONFDIR/config: $!";
2976 or return;
2977 3574
2978 local $/; 3575 utf8::decode $config;
2979 *CFG = YAML::Syck::Load <$fh>; 3576 *CFG = yaml_load $config;
2980 3577
2981 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2982 3579
2983 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2984 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2985 3582
2986 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
2990 }; 3587 };
2991 warn $@ if $@; 3588 warn $@ if $@;
2992 } 3589 }
2993} 3590}
2994 3591
3592sub pidfile() {
3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3594 or die "$PIDFILE: $!";
3595 flock $fh, &Fcntl::LOCK_EX
3596 or die "$PIDFILE: flock: $!";
3597 $fh
3598}
3599
3600# make sure only one server instance is running at any one time
3601sub atomic {
3602 my $fh = pidfile;
3603
3604 my $pid = <$fh>;
3605 kill 9, $pid if $pid > 0;
3606
3607 seek $fh, 0, 0;
3608 print $fh $$;
3609}
3610
3611sub main_loop {
3612 trace "EV::loop starting\n";
3613 if (1) {
3614 EV::loop;
3615 }
3616 trace "EV::loop returned\n";
3617 goto &main_loop unless $REALLY_UNLOOP;
3618}
3619
2995sub main { 3620sub main {
3621 cf::init_globals; # initialise logging
3622
3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627
3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629
2996 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
2997 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
2998 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3632 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2999 (async { 3633 (async {
3000 Event::one_event; 3634 $Coro::current->{desc} = "IDLE BUG HANDLER";
3635 EV::loop EV::LOOP_ONESHOT;
3001 })->prio (Coro::PRIO_MAX); 3636 })->prio (Coro::PRIO_MAX);
3002 }; 3637 };
3003 3638
3004 cfg_load; 3639 evthread_start IO::AIO::poll_fileno;
3640
3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3650 reload_resources;
3651 reload_config;
3005 db_init; 3652 db_init;
3653
3654 cf::init_uuid;
3655 cf::init_signals;
3656 cf::init_skills;
3657
3658 cf::init_beforeplay;
3659
3660 atomic;
3661
3006 load_extensions; 3662 load_extensions;
3007 3663
3008 $TICK_WATCHER->start; 3664 utime time, time, $RUNTIMEFILE;
3009 Event::loop; 3665
3666 # no (long-running) fork's whatsoever before this point(!)
3667 use POSIX ();
3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3669
3670 cf::_post_init 0;
3671 };
3672
3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3681 goto &main_loop;
3010} 3682}
3011 3683
3012############################################################################# 3684#############################################################################
3013# initialisation and cleanup 3685# initialisation and cleanup
3014 3686
3015# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3016BEGIN { 3688BEGIN {
3689 our %SIGWATCHER = ();
3017 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3018 Event->signal ( 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3019 reentrant => 0,
3020 data => WF_AUTOCANCEL,
3021 signal => $signal,
3022 prio => 0,
3023 cb => sub {
3024 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3025 },
3026 ); 3693 };
3027 } 3694 }
3028} 3695}
3029 3696
3030sub write_runtime { 3697sub write_runtime_sync {
3031 my $runtime = "$LOCALDIR/runtime"; 3698 my $t0 = AE::time;
3032 3699
3033 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3034 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3035 3702
3036 IO::AIO::aio_utime $runtime, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3037 3704
3038 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
3039 3706
3040 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3041 or return; 3708 or return;
3042 3709
3043 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
3044 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
3045 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
3055 aio_utime $fh, undef, undef; 3722 aio_utime $fh, undef, undef;
3056 3723
3057 close $fh 3724 close $fh
3058 or return; 3725 or return;
3059 3726
3060 aio_rename "$runtime~", $runtime 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3061 and return; 3728 and return;
3062 3729
3063 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3064 3731
3065 1 3732 1
3733}
3734
3735our $uuid_lock;
3736our $uuid_skip;
3737
3738sub write_uuid_sync($) {
3739 $uuid_skip ||= $_[0];
3740
3741 return if $uuid_lock;
3742 local $uuid_lock = 1;
3743
3744 my $uuid = "$LOCALDIR/uuid";
3745
3746 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3747 or return;
3748
3749 my $value = uuid_seq uuid_cur;
3750
3751 unless ($value) {
3752 info "cowardly refusing to write zero uuid value!\n";
3753 return;
3754 }
3755
3756 my $value = uuid_str $value + $uuid_skip;
3757 $uuid_skip = 0;
3758
3759 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3760 and return;
3761
3762 # always fsync - this file is important
3763 aio_fsync $fh
3764 and return;
3765
3766 close $fh
3767 or return;
3768
3769 aio_rename "$uuid~", $uuid
3770 and return;
3771
3772 trace "uuid file written ($value).\n";
3773
3774 1
3775
3776}
3777
3778sub write_uuid($$) {
3779 my ($skip, $sync) = @_;
3780
3781 $sync ? write_uuid_sync $skip
3782 : async { write_uuid_sync $skip };
3066} 3783}
3067 3784
3068sub emergency_save() { 3785sub emergency_save() {
3069 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3070 3787
3071 warn "enter emergency perl save\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3072 3794
3073 cf::sync_job { 3795 cf::sync_job {
3796 cf::write_runtime_sync; # external watchdog should not bark
3797
3074 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3075 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3076 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3077 warn "begin emergency player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3078 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3079 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3080 $pl->valid or next; 3804 $pl->valid or next;
3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3081 $pl->save; 3806 $pl->save;
3082 } 3807 }
3083 warn "end emergency player save\n"; 3808 info "emergency_perl_save: end player save\n";
3084 3809
3085 warn "begin emergency map save\n"; 3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3812 info "emergency_perl_save: begin map save\n";
3086 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3087 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3088 $map->valid or next; 3815 $map->valid or next;
3089 $map->save; 3816 $map->save;
3090 } 3817 }
3091 warn "end emergency map save\n"; 3818 info "emergency_perl_save: end map save\n";
3092 3819
3093 warn "begin emergency database checkpoint\n"; 3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3822 info "emergency_perl_save: begin database checkpoint\n";
3094 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3095 warn "end emergency database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3825
3826 info "emergency_perl_save: begin write uuid\n";
3827 write_uuid_sync 1;
3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3096 }; 3848 };
3097 3849
3098 warn "leave emergency perl save\n"; 3850 info "emergency_perl_save: leave\n";
3099} 3851}
3100 3852
3101sub post_cleanup { 3853sub post_cleanup {
3102 my ($make_core) = @_; 3854 my ($make_core) = @_;
3103 3855
3856 IO::AIO::flush;
3857
3104 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3105 if $make_core; 3859 if $make_core;
3860
3861 my $fh = pidfile;
3862 unlink $PIDFILE if <$fh> == $$;
3863}
3864
3865# a safer delete_package, copied from Symbol
3866sub clear_package($) {
3867 my $pkg = shift;
3868
3869 # expand to full symbol table name if needed
3870 unless ($pkg =~ /^main::.*::$/) {
3871 $pkg = "main$pkg" if $pkg =~ /^::/;
3872 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3873 $pkg .= '::' unless $pkg =~ /::$/;
3874 }
3875
3876 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3877 my $stem_symtab = *{$stem}{HASH};
3878
3879 defined $stem_symtab and exists $stem_symtab->{$leaf}
3880 or return;
3881
3882 # clear all symbols
3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3884 for my $name (keys %$leaf_symtab) {
3885 _gv_clear *{"$pkg$name"};
3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3887 }
3106} 3888}
3107 3889
3108sub do_reload_perl() { 3890sub do_reload_perl() {
3109 # can/must only be called in main 3891 # can/must only be called in main
3110 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3111 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3112 return; 3894 return;
3113 } 3895 }
3114 3896
3115 warn "reloading..."; 3897 return if $RELOAD++;
3116 3898
3117 warn "entering sync_job"; 3899 my $t1 = AE::time;
3118 3900
3901 while ($RELOAD) {
3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3904
3905 trace "perl_reload: entering sync_job";
3906
3119 cf::sync_job { 3907 cf::sync_job {
3120 cf::write_runtime; # external watchdog should not bark
3121 cf::emergency_save; 3908 #cf::emergency_save;
3122 cf::write_runtime; # external watchdog should not bark
3123 3909
3124 warn "syncing database to disk";
3125 BDB::db_env_txn_checkpoint $DB_ENV;
3126
3127 # if anything goes wrong in here, we should simply crash as we already saved
3128
3129 warn "cancelling all WF_AUTOCANCEL watchers";
3130 for (Event::all_watchers) {
3131 $_->cancel if $_->data & WF_AUTOCANCEL;
3132 }
3133
3134 warn "flushing outstanding aio requests";
3135 for (;;) {
3136 BDB::flush;
3137 IO::AIO::flush;
3138 Coro::cede;
3139 last unless IO::AIO::nreqs || BDB::nreqs;
3140 warn "iterate...";
3141 }
3142
3143 ++$RELOAD;
3144
3145 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3146 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3147 %EXT_CORO = (); 3912 %EXT_CORO = ();
3148 3913
3149 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3150 %COMMAND = (); 3915 %COMMAND = ();
3151 3916
3152 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3153 %EXTCMD = (); 3918 %EXTCMD = ();
3154 %EXTICMD = (); 3919 %EXTICMD = ();
3155 3920
3156 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3157 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3158 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3159 3924
3160 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3161 eval { 3926 eval {
3162 $cb->($pkg); 3927 $cb->($pkg);
3163 1 3928 1
3164 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3930 }
3931
3932 trace "... clearing $pkg";
3933 clear_package $pkg;
3165 } 3934 }
3166 3935
3167 warn "... nuking $pkg";
3168 Symbol::delete_package $pkg;
3169 }
3170
3171 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3172 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3173 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3174 3939
3175 warn "... unloading $k"; 3940 trace "... unloading $k";
3176 delete $INC{$k}; 3941 delete $INC{$k};
3177 3942
3178 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3179 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3180 3945
3181 if (my $cb = $k->can ("unload_module")) { 3946 if (my $cb = $k->can ("unload_module")) {
3182 $cb->(); 3947 $cb->();
3948 }
3949
3950 clear_package $k;
3183 } 3951 }
3184 3952
3185 Symbol::delete_package $k;
3186 }
3187
3188 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3189 Symbol::delete_package "safe::$_" 3954 clear_package "safe::$_"
3190 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3191 3956
3192 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3193 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3194 delete $INC{"cf/pod.pm"}; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3195 3960
3196 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3197 # and global variables created in xs 3962 # and global variables created in xs
3198 #Symbol::delete_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3199 3964
3200 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3201 3966
3202 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3203 require cf; 3968 require cf;
3204 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3969 cf::_connect_to_perl_1;
3205 3970
3206 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3207 cf::cfg_load; 3972 cf::reload_config;
3208 3973
3209 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3210 cf::load_extensions; 3975 cf::load_extensions;
3211 3976
3977 if ($REATTACH_ON_RELOAD) {
3212 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3213 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3214 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3215 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3216 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3217 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3984 }
3218 3985
3219 warn "leaving sync_job"; 3986 cf::_post_init 1;
3220 3987
3988 trace "perl_reload: leaving sync_job";
3989
3221 1 3990 1
3222 } or do { 3991 } or do {
3223 warn $@; 3992 error $@;
3224 warn "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3225 exit 1; 3994 };
3995
3996 --$RELOAD;
3226 }; 3997 }
3227 3998
3228 warn "reloaded"; 3999 $t1 = AE::time - $t1;
4000 info "perl_reload: completed in ${t1}s\n";
3229}; 4001};
3230 4002
3231our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3232 4004
3233sub reload_perl() { 4005sub reload_perl() {
3234 # doing reload synchronously and two reloads happen back-to-back, 4006 # doing reload synchronously and two reloads happen back-to-back,
3235 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3236 4008
3237 $RELOAD_WATCHER ||= Event->timer ( 4009 $RELOAD_WATCHER ||= cf::async {
3238 reentrant => 0, 4010 Coro::AIO::aio_wait cache_extensions;
3239 after => 0, 4011
3240 data => WF_AUTOCANCEL, 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3241 cb => sub {
3242 do_reload_perl; 4013 do_reload_perl;
3243 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
3244 }, 4015 };
3245 ); 4016 };
3246} 4017}
3247 4018
3248register_command "reload" => sub { 4019register_command "reload" => sub {
3249 my ($who, $arg) = @_; 4020 my ($who, $arg) = @_;
3250 4021
3251 if ($who->flag (FLAG_WIZ)) { 4022 if ($who->flag (FLAG_WIZ)) {
3252 $who->message ("reloading server."); 4023 $who->message ("reloading server.");
4024 async {
4025 $Coro::current->{desc} = "perl_reload";
3253 async { reload_perl }; 4026 reload_perl;
4027 };
3254 } 4028 }
3255}; 4029};
3256 4030
3257unshift @INC, $LIBDIR; 4031#############################################################################
3258 4032
3259my $bug_warning = 0; 4033my $bug_warning = 0;
3260 4034
3261our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3262our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3263 4037
3264sub wait_for_tick { 4038sub wait_for_tick() {
3265 return unless $TICK_WATCHER->is_active;
3266 return if $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3267 4040
3268 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3269 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3270 $signal->wait; 4043 $signal->wait;
3271} 4044}
3272 4045
3273sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3274 return unless $TICK_WATCHER->is_active;
3275 return if $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3276 4048
3277 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3278 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3279 $signal->wait; 4051 $signal->wait;
3280} 4052}
3281 4053
3282 my $min = 1e6;#d# 4054sub tick {
3283 my $avg = 10;
3284$TICK_WATCHER = Event->timer (
3285 reentrant => 0,
3286 parked => 1,
3287 prio => 0,
3288 at => $NEXT_TICK || $TICK,
3289 data => WF_AUTOCANCEL,
3290 cb => sub {
3291 if ($Coro::current != $Coro::main) { 4055 if ($Coro::current != $Coro::main) {
3292 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3293 unless ++$bug_warning > 10; 4057 unless ++$bug_warning > 10;
3294 return; 4058 return;
3295 } 4059 }
3296 4060
3297 $NOW = $tick_start = Event::time;
3298
3299 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3300 4062
3301 0 && sync_job {#d# 4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3302 for(1..10) {
3303 my $t = Event::time;
3304 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3305 or die;
3306 4064
3307 $map->width (50); 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3308 $map->height (50); 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3309 $map->alloc; 4067 Coro::async_pool {
3310 $map->_load_objects ("/tmp/x.map", 1); 4068 $Coro::current->{desc} = "runtime saver";
3311 my $t = Event::time - $t; 4069 write_runtime_sync
3312 4070 or error "ERROR: unable to write runtime file: $!";
3313 #next unless $t < 0.0013;#d#
3314 if ($t < $min) {
3315 $min = $t;
3316 }
3317 $avg = $avg * 0.99 + $t * 0.01;
3318 }
3319 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3320 exit 0;
3321 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3322 }; 4071 };
4072 }
3323 4073
3324 $RUNTIME += $TICK;
3325 $NEXT_TICK += $TICK;
3326
3327 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3328 $NEXT_RUNTIME_WRITE = $NOW + 10;
3329 Coro::async_pool {
3330 write_runtime
3331 or warn "ERROR: unable to write runtime file: $!";
3332 };
3333 }
3334
3335# my $AFTER = Event::time;
3336# warn $AFTER - $NOW;#d#
3337
3338 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3339 $sig->send; 4075 $sig->send;
3340 } 4076 }
3341 while (my $sig = shift @WAIT_FOR_TICK) { 4077 while (my $sig = shift @WAIT_FOR_TICK) {
3342 $sig->send; 4078 $sig->send;
3343 } 4079 }
3344 4080
3345 $NOW = Event::time; 4081 $LOAD = ($NOW - $TICK_START) / $TICK;
3346
3347 # if we are delayed by four ticks or more, skip them all
3348 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3349
3350 $TICK_WATCHER->at ($NEXT_TICK);
3351 $TICK_WATCHER->start;
3352
3353 $LOAD = ($NOW - $tick_start) / $TICK;
3354 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4082 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3355 4083
3356 _post_tick; 4084 if (0) {
3357 4085 if ($NEXT_TICK) {
3358 4086 my $jitter = $TICK_START - $NEXT_TICK;
4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4088 debug "jitter $JITTER\n";#d#
4089 }
3359 }, 4090 }
3360); 4091}
3361 4092
3362{ 4093{
3363 BDB::max_poll_time $TICK * 0.1; 4094 # configure BDB
3364 $BDB_POLL_WATCHER = Event->io ( 4095
3365 reentrant => 0,
3366 fd => BDB::poll_fileno,
3367 poll => 'r',
3368 prio => 0,
3369 data => WF_AUTOCANCEL,
3370 cb => \&BDB::poll_cb,
3371 );
3372 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3373 4097 BDB::max_poll_reqs $TICK * 0.1;
3374 BDB::set_sync_prepare { 4098 $AnyEvent::BDB::WATCHER->priority (1);
3375 my $status;
3376 my $current = $Coro::current;
3377 (
3378 sub {
3379 $status = $!;
3380 $current->ready; undef $current;
3381 },
3382 sub {
3383 Coro::schedule while defined $current;
3384 $! = $status;
3385 },
3386 )
3387 };
3388 4099
3389 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3390 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
4102 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4103 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4104 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4105 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4106 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3391 4107
3392 cf::sync_job { 4108 cf::sync_job {
3393 eval { 4109 eval {
3394 BDB::db_env_open 4110 BDB::db_env_open
3395 $DB_ENV, 4111 $DB_ENV,
3397 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3398 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3399 0666; 4115 0666;
3400 4116
3401 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4117 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3402
3403 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3404 $DB_ENV->set_lk_detect;
3405 }; 4118 };
3406 4119
3407 cf::cleanup "db_env_open(db): $@" if $@; 4120 cf::cleanup "db_env_open(db): $@" if $@;
3408 }; 4121 };
3409 } 4122 }
4123
4124 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4125 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4126 };
4127 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4128 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4129 };
4130 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4131 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4132 };
3410} 4133}
3411 4134
3412{ 4135{
4136 # configure IO::AIO
4137
3413 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3414
3415 undef $Coro::AIO::WATCHER;
3416 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3417 $AIO_POLL_WATCHER = Event->io ( 4140 undef $AnyEvent::AIO::WATCHER;
3418 reentrant => 0,
3419 data => WF_AUTOCANCEL,
3420 fd => IO::AIO::poll_fileno,
3421 poll => 'r',
3422 prio => 6,
3423 cb => \&IO::AIO::poll_cb,
3424 );
3425} 4141}
3426 4142
3427my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3428 4145
3429sub _log_backtrace { 4146sub _log_backtrace {
3430 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3431 4148
3432 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3433 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3434 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3435 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3436 ++$_log_backtrace; 4157 ++$_log_backtrace;
4158 my $perl_bt = Carp::longmess $msg;
3437 async { 4159 async {
4160 $Coro::current->{desc} = "abt $msg";
4161
3438 my @bt = fork_call { 4162 my @bt = fork_call {
3439 @addr = map { sprintf "%x", $_ } @addr; 4163 @addr = map { sprintf "%x", $_ } @addr;
3440 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4164 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3441 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4165 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3442 or die "addr2line: $!"; 4166 or die "addr2line: $!";
3450 } 4174 }
3451 4175
3452 @funcs 4176 @funcs
3453 }; 4177 };
3454 4178
3455 LOG llevInfo, "[ABT] $msg\n"; 4179 LOG llevInfo, "[ABT] $perl_bt\n";
4180 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3456 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
3457 --$_log_backtrace; 4182 --$_log_backtrace;
3458 }; 4183 };
3459 } else { 4184 } else {
3460 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
3461 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3462 } 4187 }
3463} 4188}
3464 4189
3465# load additional modules 4190# load additional modules
3466use cf::pod; 4191require "cf/$_.pm" for @EXTRA_MODULES;
4192cf::_connect_to_perl_2;
3467 4193
3468END { cf::emergency_save } 4194END { cf::emergency_save }
3469 4195
34701 41961
3471 4197

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines