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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines