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.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines