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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines