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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines