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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines