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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines