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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
84our $BDB_POLL_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 127our $DB_ENV;
88 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
89our %CFG; 131our %CFG;
90 132
91our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 134our $RUNTIME;
135our $NOW;
93 136
94our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
97 140
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 143
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
103our $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 :)
104 153
105binmode STDOUT; 154binmode STDOUT;
106binmode STDERR; 155binmode STDERR;
107 156
108# read virtual server time, if available 157# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
113} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
114 165
115mkdir $_ 166mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 168
118our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
119 170
120sub 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::"} };
121 187
122############################################################################# 188#############################################################################
123 189
124=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
125 191
161 227
162The raw value load value from the last tick. 228The raw value load value from the last tick.
163 229
164=item %cf::CFG 230=item %cf::CFG
165 231
166Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 233from wherever your confdir points to.
168 234
169=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
170 236
171These 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
172returns 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 process
173per 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.
174 240
175=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
176 242
177This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 245that call.
180 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
181=back 253=back
182 254
183=cut 255=cut
184 256
185BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
186 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
187 my $msg = join "", @_; 264 my $msg = join "", @_;
188 265
189 $msg .= "\n" 266 $msg .= "\n"
190 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
191 268
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 270
194 LOG llevError, $msg; 271 LOG llevWarn, $msg;
195 }; 272};
196} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
197 287
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 298for my $pkg (qw(
209 cf::global cf::attachable 299 cf::global cf::attachable
210 cf::object cf::object::player 300 cf::object cf::object::player
211 cf::client cf::player 301 cf::client cf::player
212 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
213 cf::map cf::party cf::region 304 cf::party cf::region
214)) { 305)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 307}
218 308
219$Event::DIED = sub { 309$EV::DIED = sub {
220 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
221}; 311};
222 312
223############################################################################# 313#############################################################################
224 314
225=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 338 $d
249 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
250} 340}
251 341
252=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
253 343
254Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
255 345
256=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
257 347
258Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
259 349
260=cut 350=cut
261 351
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 353
264sub to_json ($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
266 370
267=item cf::lock_wait $string 371=item cf::lock_wait $string
268 372
269Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
270 374
271=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
272 376
273Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
276returned. 380returned.
277 381
278Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 383deadlocked coro.
285 389
286Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
287 391
288=cut 392=cut
289 393
290our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 395
293sub lock_wait($) { 396sub lock_wait($) {
294 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 398}
307 399
308sub lock_acquire($) { 400sub lock_acquire($) {
309 my ($key) = @_; 401 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 402}
323 403
324sub lock_active($) { 404sub lock_active($) {
325 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 406}
329 407
330sub freeze_mainloop { 408sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
332 410
333 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 412}
335 }; 413
336 $TICK_WATCHER->stop; 414=item cf::periodic $interval, $cb
337 $guard 415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
338} 427}
339 428
340=item cf::get_slot $time[, $priority[, $name]] 429=item cf::get_slot $time[, $priority[, $name]]
341 430
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 431Allocate $time seconds of blocking CPU time at priority C<$priority>:
350 439
351=cut 440=cut
352 441
353our @SLOT_QUEUE; 442our @SLOT_QUEUE;
354our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
355 445
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
358 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
359 452
360 while () { 453 while () {
361 next_job: 454 next_job:
455
362 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 457
364 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 462 $job->[2]->send;
368 Coro::cede; 463 Coro::cede;
369 goto next_job; 464 goto next_job;
370 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 467 }
372 } 468 }
373 469
374 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 473 $signal->wait;
378 } else { 474 } else {
475 $busy = 0;
379 Coro::schedule; 476 Coro::schedule;
380 } 477 }
381 } 478 }
382}; 479};
383 480
384sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
385 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
386 485
387 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
388 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
389 489
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
403 503
404BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
405 505
406=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
407 507
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 511acceptable.
412 512
413If it must be done, put the blocking parts into C<sync_job>. This will run 513If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
418=cut 518=cut
419 519
420sub sync_job(&) { 520sub sync_job(&) {
421 my ($job) = @_; 521 my ($job) = @_;
422 522
423 if ($Coro::current == $Coro::main) { 523 if (in_main) {
424 my $time = Event::time; 524 my $time = AE::time;
425 525
426 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
428 528
429 # TODO: use suspend/resume instead 529 #LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 530
431 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
432 532
433 my $busy = 1; 533 my $busy = 1;
434 my @res; 534 my @res;
435 535
436 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 538 @res = eval { $job->() };
438 warn $@ if $@; 539 error $@ if $@;
439 undef $busy; 540 undef $busy;
440 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
441 542
442 while ($busy) { 543 while ($busy) {
443 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
444 } 548 }
549 }
445 550
446 $time = Event::time - $time; 551 my $time = AE::time - $time;
447 552
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
452 554
453 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
454 } else { 556 } else {
455 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
456 558
481=item fork_call { }, $args 583=item fork_call { }, $args
482 584
483Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
487 589
488=cut 590=cut
489 591
490sub fork_call(&@) { 592sub fork_call(&@) {
491 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
500 }, @args; 602 }, @args;
501 603
502 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
503} 605}
504 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
505=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
506 646
507Returns a single value from the environment database. 647Returns a single value from the environment database.
508 648
509=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
517within each server. 657within each server.
518 658
519=cut 659=cut
520 660
521sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
522 my ($name) = @_; 665 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
524 667
525 eval { 668 eval {
526 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
536} 679}
537 680
538our $DB; 681our $DB;
539 682
540sub db_init { 683sub db_init {
541 cf::sync_job {
542 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
543 };
544} 685}
545 686
546sub db_get($$) { 687sub db_get($$) {
547 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
548 689
549 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
550 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
551 694
552 $! ? () 695 $! ? ()
553 : $data 696 : $data
554 }
555} 697}
556 698
557sub db_put($$$) { 699sub db_put($$$) {
558 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
615 757
616 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data); 759 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
619 761
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
621 763
622 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
625 767
635 777
636=cut 778=cut
637 779
638sub datalog($@) { 780sub datalog($@) {
639 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
640 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
641} 783}
642 784
643=back 785=back
644 786
645=cut 787=cut
646 788
647############################################################################# 789#############################################################################
648 790
649=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
650 792
651Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
654 796
655In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 799Deliantra).
658 800
659=over 4 801=over 4
660 802
661=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
662 804
706=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
707 849
708Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
710 852
711Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
713 855
714These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
715 857
716=over 4 858=over 4
840 982
841 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
842 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
843 985
844 } elsif (ref $type) { 986 } elsif (ref $type) {
845 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
846 988
847 } else { 989 } else {
848 shift @arg; 990 shift @arg;
849 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
850 } 992 }
851 } 993 }
852} 994}
853 995
854sub _object_attach { 996sub _object_attach {
864 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
865 } 1007 }
866 1008
867 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
868 } else { 1010 } else {
869 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
870 } 1012 }
871 1013
872 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
873} 1015}
874 1016
933 1075
934 for (@$callbacks) { 1076 for (@$callbacks) {
935 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
936 1078
937 if ($@) { 1079 if ($@) {
938 warn "$@";
939 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
940 override; 1081 override;
941 } 1082 }
942 1083
943 return 1 if $override; 1084 return 1 if $override;
944 } 1085 }
945 1086
946 0 1087 0
947} 1088}
948 1089
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1091
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1093
953Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
954 1095
960 1101
961=cut 1102=cut
962 1103
963############################################################################# 1104#############################################################################
964# object support 1105# object support
965#
966 1106
1107sub _object_equal($$);
1108sub _object_equal($$) {
1109 my ($a, $b) = @_;
1110
1111 return 0 unless (ref $a) eq (ref $b);
1112
1113 if ("HASH" eq ref $a) {
1114 my @ka = keys %$a;
1115 my @kb = keys %$b;
1116
1117 return 0 if @ka != @kb;
1118
1119 for (0 .. $#ka) {
1120 return 0 unless $ka[$_] eq $kb[$_];
1121 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1122 }
1123
1124 } elsif ("ARRAY" eq ref $a) {
1125
1126 return 0 if @$a != @$b;
1127
1128 for (0 .. $#$a) {
1129 return 0 unless _object_equal $a->[$_], $b->[$_];
1130 }
1131
1132 } elsif ($a ne $b) {
1133 return 0;
1134 }
1135
1136 1
1137}
1138
1139our $SLOW_MERGES;#d#
967sub _can_merge { 1140sub _can_merge {
968 my ($ob1, $ob2) = @_; 1141 my ($ob1, $ob2) = @_;
969 1142
970 local $Storable::canonical = 1; 1143 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1144
974 $fob1 eq $fob2 1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
975} 1147}
976 1148
977sub reattach { 1149sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1151 my ($obj) = @_;
980 1152
1153 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1155
983 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
984 1157
985 @$registry = (); 1158 @$registry = ();
986 1159
991 for (@$attach) { 1164 for (@$attach) {
992 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
993 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
994 } 1167 }
995 } else { 1168 } else {
996 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
997 } 1170 }
998 } 1171 }
999} 1172}
1000 1173
1001cf::attachable->attach ( 1174cf::attachable->attach (
1002 prio => -1000000, 1175 prio => -1000000,
1003 on_instantiate => sub { 1176 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
1005 1178
1006 $data = from_json $data; 1179 $data = decode_json $data;
1007 1180
1008 for (@$data) { 1181 for (@$data) {
1009 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
1010 1183
1011 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
1025); 1198);
1026 1199
1027sub object_freezer_save { 1200sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1029 1202
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1203 sync_job {
1033 if (length $$rdata) { 1204 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1037 1209
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1042 close $fh; 1217 aio_close $fh;
1043 1218
1044 if (@$objs) { 1219 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1050 close $fh; 1228 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1230 }
1053 } else { 1231 } else {
1054 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1055 } 1233 }
1056 1234
1057 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1239 } else {
1059 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1060 } 1241 }
1061 } else { 1242 } else {
1062 aio_unlink $filename; 1243 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1064 } 1245 }
1065 }; 1246 };
1066
1067 undef $guard;
1068} 1247}
1069 1248
1070sub object_freezer_as_string { 1249sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
1072 1251
1077 1256
1078sub object_thawer_load { 1257sub object_thawer_load {
1079 my ($filename) = @_; 1258 my ($filename) = @_;
1080 1259
1081 my ($data, $av); 1260 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1261
1085 (aio_load $filename, $data) >= 0 1262 (aio_load $filename, $data) >= 0
1086 or return; 1263 or return;
1087 1264
1088 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1267 or return;
1091 1268
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1094 } 1271 }
1095 1272
1096 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1099 1277
1100 ($data, $av) 1278 ($data, $av)
1101} 1279}
1102 1280
1103=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1159 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1160 1338
1161 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1162} 1340}
1163 1341
1342use File::Glob ();
1343
1164cf::player->attach ( 1344cf::player->attach (
1165 on_command => sub { 1345 on_unknown_command => sub {
1166 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1167 1347
1168 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1169 or return; 1349 or return;
1170 1350
1193 1373
1194 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1195 if $reply; 1375 if $reply;
1196 1376
1197 } else { 1377 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1379 }
1200 1380
1201 cf::override; 1381 cf::override;
1202 }, 1382 },
1203); 1383);
1204 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1205sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1206 cf::sync_job { 1401 cf::sync_job {
1207 my %todo; 1402 my %todo;
1208 1403
1209 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1210 next unless -r $path; 1405 next unless -r $path;
1228 1423
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1426
1232 $ext{source} = 1427 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1234 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1235 . $source 1430 . $source
1236 . "\n};\n1"; 1431 . "\n};\n1";
1237 1432
1238 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1239 } 1434 }
1240 1435
1436 my $pass = 0;
1241 my %done; 1437 my %done;
1242 while (%todo) { 1438 while (%todo) {
1243 my $progress; 1439 my $progress;
1244 1440
1441 ++$pass;
1442
1443 ext:
1245 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1446 next ext
1248 unless exists $done{$_}; 1447 unless exists $done{$_};
1249 } 1448 }
1250 1449
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1451
1253 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1256 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1258 warn $msg; 1460
1259 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1462 delete $todo{$k};
1261 } 1463 } else {
1262 1464 $done{$k} = delete $todo{$k};
1263 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1264 } 1470 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1471 }
1270 1472
1271 skip: 1473 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1274 } 1481 }
1275 }; 1482 };
1276} 1483}
1277 1484
1278############################################################################# 1485#############################################################################
1279 1486
1280=back 1487=back
1281 1488
1282=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1283 1490
1284Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1285 1492
1286=cut 1493=cut
1287 1494
1288package cf::player; 1495package cf::player;
1289 1496
1332 1539
1333sub exists($) { 1540sub exists($) {
1334 my ($login) = @_; 1541 my ($login) = @_;
1335 1542
1336 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1338} 1545}
1339 1546
1340sub find($) { 1547sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1549 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1559 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1560
1354 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1562 or return;
1356 1563
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1359 or return; 1565 or return;
1566
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1363 } 1570 }
1364 } 1571 }
1365} 1572}
1366 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1367sub save($) { 1587sub save($) {
1368 my ($pl) = @_; 1588 my ($pl) = @_;
1369 1589
1370 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1371 1591
1374 1594
1375 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1376 1596
1377 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1604
1380 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1606 cf::cede_to_tick;
1382} 1607}
1383 1608
1415 my ($pl) = @_; 1640 my ($pl) = @_;
1416 1641
1417 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1418 1643
1419 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1646
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1426 1652
1427 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1693
1468 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1469 my $path = path $login; 1695 my $path = path $login;
1470 1696
1471 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1703 }
1477 1704
1481 1708
1482 \@logins 1709 \@logins
1483} 1710}
1484 1711
1485=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1486 1715
1487Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1488player. May block. 1717player. May block.
1489 1718
1490=cut 1719=cut
1508 } 1737 }
1509 1738
1510 \@paths 1739 \@paths
1511} 1740}
1512 1741
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1743
1515Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1745
1564=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1565 1747
1566Sends an ext reply to the player. 1748Sends an ext reply to the player.
1567 1749
1599 1781
1600=cut 1782=cut
1601 1783
1602sub find_by_path($) { 1784sub find_by_path($) {
1603 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1604 1788
1605 my ($match, $specificity); 1789 my ($match, $specificity);
1606 1790
1607 for my $region (list) { 1791 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1636 1820
1637sub generate_random_map { 1821sub generate_random_map {
1638 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1639 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1827 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1662 1849
1663sub register { 1850sub register {
1664 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1852 my $pkg = caller;
1666 1853
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1855
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1857}
1672 1858
1673# also paths starting with '/' 1859# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1861
1676sub thawer_merge { 1862sub thawer_merge {
1677 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1678 1864
1679 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1765 1951
1766# the temporary/swap location 1952# the temporary/swap location
1767sub save_path { 1953sub save_path {
1768 my ($self) = @_; 1954 my ($self) = @_;
1769 1955
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1772} 1958}
1773 1959
1774# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1775sub uniq_path { 1961sub uniq_path {
1776 my ($self) = @_; 1962 my ($self) = @_;
1777 1963
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1966}
1790 1967
1791sub decay_objects { 1968sub decay_objects {
1792 my ($self) = @_; 1969 my ($self) = @_;
1793 1970
1877sub find { 2054sub find {
1878 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1879 2056
1880 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1881 2058
1882 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2061
1885 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1890 or return; 2064 or return;
1891 2065
1892 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1893 2067
1895 or return; 2069 or return;
1896 2070
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1900 undef $guard1; 2075 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2076 $map->reset;
1903 return find $path; 2077 return find $path;
1904 } 2078 }
1905 2079
1906 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1907 } 2081 }
1908} 2082}
1909 2083
1910sub pre_load { } 2084sub pre_load { }
1911sub post_load { } 2085#sub post_load { } # XS
1912 2086
1913sub load { 2087sub load {
1914 my ($self) = @_; 2088 my ($self) = @_;
1915 2089
1916 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2108 $f->skip_block;
1935 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
1936 or return; 2110 or return;
1937 2111
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1939 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1940 2114
1941 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2116 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2136 $self->decay_objects;
1963 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
1964 $self->update_buttons; 2138 $self->update_buttons;
1965 cf::cede_to_tick; 2139 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2140 $self->activate;
1969 } 2141 }
1970 2142
1971 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
1973 2145
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2147 }
1976 2148
1977 $self->post_load; 2149 $self->post_load;
1978} 2150}
1979 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
1980sub customise_for { 2155sub customise_for {
1981 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
1982 2157
1983 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2159 if $self->per_player;
2000 or next; 2175 or next;
2001 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2002 or next; 2177 or next;
2003 $neigh->load; 2178 $neigh->load;
2004 2179
2180 # now find the diagonal neighbours
2005 push @neigh, 2181 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2184 }
2009 2185
2016} 2192}
2017 2193
2018sub find_sync { 2194sub find_sync {
2019 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2020 2196
2021 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2022} 2201}
2023 2202
2024sub do_load_sync { 2203sub do_load_sync {
2025 my ($map) = @_; 2204 my ($map) = @_;
2026 2205
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2029 2208
2030 cf::sync_job { $map->load }; 2209 $map->load;
2031} 2210}
2032 2211
2033our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2035 2214
2037 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2038 2217
2039 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2040 2219
2041 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2222 }
2044 2223
2045 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2046 2225
2047 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2227 $Coro::current->{desc} = "map prefetcher";
2228
2048 while (%MAP_PREFETCH) { 2229 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2230 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2231 if (my $map = find $k) {
2051 $map->load if $v; 2232 $map->load if $v;
2052 } 2233 }
2059 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2060 2241
2061 () 2242 ()
2062} 2243}
2063 2244
2245# common code, used by both ->save and ->swapout
2064sub save { 2246sub _save {
2065 my ($self) = @_; 2247 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2248
2069 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2070 2250
2071 return unless $self->dirty; 2251 return unless $self->dirty;
2072 2252
2078 return if $self->{deny_save}; 2258 return if $self->{deny_save};
2079 2259
2080 local $self->{last_access} = $self->last_access;#d# 2260 local $self->{last_access} = $self->last_access;#d#
2081 2261
2082 cf::async { 2262 cf::async {
2263 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2084 }; 2265 };
2266
2267 cf::get_slot 0.02;
2085 2268
2086 if ($uniq) { 2269 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2272 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2274 }
2092} 2275}
2093 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2094sub swap_out { 2285sub swap_out {
2095 my ($self) = @_; 2286 my ($self) = @_;
2096 2287
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2102 return if $self->players; 2292 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2107 2344
2108 $self->deactivate; 2345 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2347 $self->clear;
2111}
2112
2113sub reset_at {
2114 my ($self) = @_;
2115
2116 # TODO: safety, remove and allow resettable per-player maps
2117 return 1e99 if $self->{deny_reset};
2118
2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2121
2122 $time + $to
2123}
2124
2125sub should_reset {
2126 my ($self) = @_;
2127
2128 $self->reset_at <= $cf::RUNTIME
2129}
2130
2131sub reset {
2132 my ($self) = @_;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135
2136 return if $self->players;
2137
2138 warn "resetting map ", $self->path;
2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 # need to save uniques path
2143 unless ($self->{deny_save}) {
2144 my $uniq = $self->uniq_path; utf8::encode $uniq;
2145
2146 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2147 if $uniq;
2148 }
2149
2150 delete $cf::MAP{$self->path};
2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2154 $self->clear;
2155 2348
2156 $self->unlink_save; 2349 $self->unlink_save;
2157 $self->destroy; 2350 $self->destroy;
2158} 2351}
2159 2352
2167 2360
2168 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2169 2362
2170 $self->unlink_save; 2363 $self->unlink_save;
2171 2364
2172 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2370
2226 2419
2227sub unique_maps() { 2420sub unique_maps() {
2228 [ 2421 [
2229 map { 2422 map {
2230 utf8::decode $_; 2423 utf8::decode $_;
2231 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2232 ? normalise $_ 2427 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2429 ]
2236} 2430}
2237 2431
2238package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2239 2463
2240=back 2464=back
2241 2465
2242=head3 cf::object 2466=head3 cf::object
2243 2467
2247 2471
2248=over 4 2472=over 4
2249 2473
2250=item $ob->inv_recursive 2474=item $ob->inv_recursive
2251 2475
2252Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2253 2478
2254=cut 2479=cut
2255 2480
2256sub inv_recursive_; 2481sub inv_recursive_;
2257sub inv_recursive_ { 2482sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2263} 2488}
2264 2489
2265=item $ref = $ob->ref 2490=item $ref = $ob->ref
2266 2491
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2268 2493
2269=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2270 2495
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2497even if the object actually exists. May block.
2274=cut 2499=cut
2275 2500
2276sub deref { 2501sub deref {
2277 my ($ref) = @_; 2502 my ($ref) = @_;
2278 2503
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2504 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2505 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2506 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2507 or return;
2286 $pl->ob->uuid eq $uuid 2508 $pl->ob->uuid eq $uuid
2287 or return; 2509 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2530dialogue with the given NPC character.
2309 2531
2310=cut 2532=cut
2311 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2312# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2549# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2565
2330 } else { 2566 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2569 }
2334 } 2570 }
2335} 2571}
2336 2572
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2598
2363=item $player_object->enter_link 2599=item $player_object->enter_link
2364 2600
2365Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2366 2602
2367The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2369 2607
2370Will never block. 2608Will never block.
2371 2609
2372=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2373 2611
2393sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2394 my ($self) = @_; 2632 my ($self) = @_;
2395 2633
2396 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2397 2635
2636 ++$self->{_link_recursion};
2637
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2639
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2402 2642
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2644}
2405 2645
2406sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2408 2648
2425 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2427 2667
2428 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2431 2671
2432 $map->load; 2672 $map->load;
2433 $map->load_neighbours; 2673 $map->load_neighbours;
2434 2674
2435 return unless $self->contr->active; 2675 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2676
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2440} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2441 2684
2685}
2686
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2688
2444Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2693be called at the end of this process.
2449 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2450=cut 2698=cut
2451 2699
2452our $GOTOGEN; 2700our $GOTOGEN;
2453 2701
2454sub cf::object::player::goto { 2702sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2710
2457 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2713
2460 $self->enter_link; 2714 $self->enter_link;
2461 2715
2462 (async { 2716 (async {
2717 $Coro::current->{desc} = "player::goto $path $x $y";
2718
2463 # *tag paths override both path and x|y 2719 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2720 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2721 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2722 my $ob = $obs[rand @obs];
2467 2723
2468 # see if we actually can go there 2724 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2725 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2726 $ob = $obs[rand @obs];
2727 } else {
2728 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2729 }
2730 # else put us there anyways for now #d#
2471 2731
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2732 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2733 } else {
2734 ($path, $x, $y) = (undef, undef, undef);
2473 } 2735 }
2474 } 2736 }
2475 2737
2476 my $map = eval { 2738 my $map = eval {
2477 my $map = cf::map::find $path; 2739 my $map = defined $path ? cf::map::find $path : undef;
2478 2740
2479 if ($map) { 2741 if ($map) {
2480 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2482 } else { 2744 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2746 }
2485 2747
2486 $map 2748 $map
2487 }; 2749 };
2488 2750
2494 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2495 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2496 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2497 } 2759 }
2498 2760
2499 $done->() if $done; 2761 $done->($self) if $done;
2500 })->prio (1); 2762 })->prio (1);
2501} 2763}
2502 2764
2503=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2504 2766
2524} 2786}
2525 2787
2526sub prepare_random_map { 2788sub prepare_random_map {
2527 my ($exit) = @_; 2789 my ($exit) = @_;
2528 2790
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2793 # that depends on the exit object
2534 2794
2535 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2797 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2542 } 2804 }
2543 2805
2544 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2545 2807
2546 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2549 2811
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2814 undef $fh;
2553 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2554 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2557 } 2823 }
2558} 2824}
2559 2825
2560sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2562 2828
2563 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2564 2830
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2831 $self->enter_link;
2577 2832
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2833 (async {
2583 $self->deactivate_recursive; # just to be sure 2834 $Coro::current->{desc} = "enter_exit";
2835
2584 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2585 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2586 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2587 1; 2857 1
2588 }) { 2858 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2863
2594 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2595 $self->leave_link; 2865 $self->leave_link;
2596 } 2866 }
2597 })->prio (1); 2867 })->prio (1);
2598} 2868}
2599 2869
2611sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2612 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2613 2883
2614 utf8::encode $text; 2884 utf8::encode $text;
2615 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2616} 2911}
2617 2912
2618=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2619 2914
2620Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2917the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2918the message unless the client supports the msg packet.
2624 2919
2625=cut 2920=cut
2626 2921
2922# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2628 "c/identify" => { 2930 "c/identify" => {
2629 id => "identify", 2931 id => "infobox",
2630 title => "Identify", 2932 title => "Identify",
2631 reply => undef, 2933 reply => undef,
2632 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2633 }, 2935 },
2634 "c/examine" => { 2936 "c/examine" => {
2635 id => "examine", 2937 id => "infobox",
2636 title => "Examine", 2938 title => "Examine",
2637 reply => undef, 2939 reply => undef,
2638 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2639 }, 2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2947 },
2948 "c/book" => {
2949 id => "infobox",
2950 title => "Book",
2951 reply => undef,
2952 tooltip => "The contents of a note or book",
2953 },
2954 "c/lookat" => {
2955 id => "infobox",
2956 title => "Look",
2957 reply => undef,
2958 tooltip => "What you saw there",
2959 },
2960 "c/who" => {
2961 id => "infobox",
2962 title => "Players",
2963 reply => undef,
2964 tooltip => "Shows players who are currently online",
2965 },
2966 "c/body" => {
2967 id => "infobox",
2968 title => "Body Parts",
2969 reply => undef,
2970 tooltip => "Shows which body parts you posess and are available",
2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
3008 "c/uptime" => {
3009 id => "infobox",
3010 title => "Uptime",
3011 reply => undef,
3012 tooltip => "How long the server has been running since last restart",
3013 },
3014 "c/mapinfo" => {
3015 id => "infobox",
3016 title => "Map Info",
3017 reply => undef,
3018 tooltip => "Information related to the maps",
3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2640); 3034);
2641 3035
2642sub cf::client::send_msg { 3036sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2644 3038
2645 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2646 3041
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 3043
2649 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3045 if ($CHANNEL{$channel}) {
3046 $channel = $CHANNEL{$channel};
2651 3047
3048 $self->ext_msg (channel_info => $channel);
3049 $channel = $channel->{id};
3050
2652 if (ref $channel) { 3051 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2657 if $self->can_msg;
2658 } 3056 }
2659 3057
2660 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2661 } 3059 }
2662 3060
2663 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2664 3062
2665 if ($self->can_msg) {
2666 # default colour, mask it out 3063 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2669 3066
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2672 } else { 3070 );
2673 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones
2675 for ($msg) {
2676 1 while
2677 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2678 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2679 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2680 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2681 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2682 }
2683 3071
2684 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2685
2686 utf8::encode $msg;
2687
2688 if (0 && $msg =~ /\[/) {
2689 # COMMAND/INFO
2690 $self->send_packet ("drawextinfo $color 10 8 $msg")
2691 } else {
2692 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2693 $self->send_packet ("drawinfo $color $msg")
2694 }
2695 }
2696 }
2697} 3073}
2698 3074
2699=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2700 3076
2701Sends an ext event to the client. 3077Sends an ext event to the client.
2704 3080
2705sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2706 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2707 3083
2708 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2709 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2710 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2711 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2712 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2713 } 3089 }
2714} 3090}
2715 3091
2716=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2717 3093
2721 3097
2722sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2723 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2724 3100
2725 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2726 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2727 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2728 #TODO: version 1, remove 3104 #TODO: version 1, remove
2729 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 } 3107 }
2732} 3108}
2733 3109
2734=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2735 3111
2806 3182
2807 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2808 if $reply; 3184 if $reply;
2809 3185
2810 } else { 3186 } else {
2811 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2812 } 3188 }
2813 3189
2814 cf::override; 3190 cf::override;
2815 }, 3191 },
2816); 3192);
2836 3212
2837 $coro 3213 $coro
2838} 3214}
2839 3215
2840cf::client->attach ( 3216cf::client->attach (
2841 on_destroy => sub { 3217 on_client_destroy => sub {
2842 my ($ns) = @_; 3218 my ($ns) = @_;
2843 3219
2844 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2845 }, 3221 },
2846); 3222);
2862our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2863 3239
2864$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2865 3241
2866$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
2867 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
2868 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
2869 sort time 3245 sort time
2870)); 3246));
2871 3247
2872# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2874=pod 3250=pod
2875 3251
2876The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2877 3253
2878 cf::object 3254 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3255 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
2881 3258
2882 cf::object::player 3259 cf::object::player
2883 player 3260 player
2884 3261
2885 cf::player 3262 cf::player
2890 3267
2891=cut 3268=cut
2892 3269
2893for ( 3270for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3273 decrease split destroy change_exp value msg lore send_msg)],
2897 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2899 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2900) { 3277) {
2901 no strict 'refs';
2902 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
2903 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2904 for @funs; 3280 for @funs;
2905} 3281}
2906 3282
2921 3297
2922 my $qcode = $code; 3298 my $qcode = $code;
2923 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2924 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
2925 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
2926 local $_; 3305 local $_;
2927 local @safe::cf::_safe_eval_args = values %vars;
2928 3306
2929 my $eval = 3307 my $eval =
2930 "do {\n" 3308 "do {\n"
2931 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2932 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
2933 . $code 3311 . $code
2934 . "\n}" 3312 . "\n}"
2935 ; 3313 ;
2936 3314
3315 if ($CFG{safe_eval}) {
2937 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
2938 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2939 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
2940 3324
2941 if ($@) { 3325 if ($@) {
2942 warn "$@"; 3326 warn "$@",
2943 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
2944 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
2945 } 3329 }
2946 3330
2947 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
2948} 3332}
2949 3333
2963=cut 3347=cut
2964 3348
2965sub register_script_function { 3349sub register_script_function {
2966 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
2967 3351
2968 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
2969 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
2970} 3354}
2971 3355
2972=back 3356=back
2973 3357
2974=cut 3358=cut
2975 3359
2976############################################################################# 3360#############################################################################
2977# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
2978 3404
2979sub load_facedata($) { 3405sub load_facedata($) {
2980 my ($path) = @_; 3406 my ($path) = @_;
2981 3407
2982 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
2983 # for this (global event?) 3409 # for this (global event?)
2984 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
2985 3411
2986 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2987 3413
2988 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
2989 3415
2990 my $facedata; 3416 my $facedata;
2991 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
2992 or die "$path: $!"; 3418 or die "$path: $!";
2993 3419
2995 3421
2996 $facedata->{version} == 2 3422 $facedata->{version} == 2
2997 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
2998 3424
2999 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3000 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3001 type => FT_RSRC, 3428 type => FT_RSRC,
3002 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3003 }; 3431 };
3004 cf::cede_to_tick; 3432 cf::cede_to_tick;
3005 3433
3006 { 3434 {
3007 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3008 3436
3009 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439
3011 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3015 3444
3016 cf::cede_to_tick; 3445 cf::cede_to_tick;
3017 } 3446 }
3018 3447
3019 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3449 next unless $info->{smooth};
3450
3021 my $idx = cf::face::find $face 3451 my $idx = cf::face::find $face
3022 or next; 3452 or next;
3453
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3457 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3028 } 3459 }
3029 3460
3030 cf::cede_to_tick; 3461 cf::cede_to_tick;
3031 } 3462 }
3032 } 3463 }
3041 3472
3042 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3043 } 3474 }
3044 3475
3045 { 3476 {
3046 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3049 3478
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3480 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data;
3055 3482
3056 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3057 # prepend meta info 3484 cf::face::set_type $idx, $info->{type};
3058
3059 my $meta = $enc->encode ({
3060 name => $name,
3061 %{ $info->{meta} || {} },
3062 });
3063
3064 $data = pack "(w/a*)*", $meta, $info->{data};
3065 } else { 3485 } else {
3066 $data = $info->{data}; 3486 $RESOURCE{$name} = $info; # unused
3067 } 3487 }
3068 3488
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3489 cf::cede_to_tick;
3073 } 3490 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3491 }
3492
3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3494
3094 1 3495 1
3095} 3496}
3096 3497
3097register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3099 3500
3100 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3502 $ns->fx_want ($k, $v);
3102 } 3503 }
3103}; 3504};
3505
3506sub load_resource_file($) {
3507 my $guard = lock_acquire "load_resource_file";
3508
3509 my $status = load_resource_file_ $_[0];
3510 get_slot 0.1, 100;
3511 cf::arch::commit_load;
3512
3513 $status
3514}
3104 3515
3105sub reload_regions { 3516sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3518 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3533}
3123 3534
3124sub reload_archetypes { 3535sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3537 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3538}
3133 3539
3134sub reload_treasures { 3540sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3137} 3543}
3138 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3139sub reload_resources { 3568sub reload_resources {
3140 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3141 3570
3571 reload_facedata;
3572 reload_sound;
3573 reload_archetypes;
3142 reload_regions; 3574 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3575 reload_treasures;
3147 3576
3148 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3149}
3150
3151sub init {
3152 reload_resources;
3153} 3578}
3154 3579
3155sub reload_config { 3580sub reload_config {
3581 trace "reloading config file...\n";
3582
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3584 or return;
3158 3585
3159 local $/; 3586 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3161 3588
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3163 3590
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3166 3593
3167 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3169 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3170 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3171 }; 3598 };
3172 warn $@ if $@; 3599 warn $@ if $@;
3173 } 3600 }
3601
3602 trace "finished reloading resource files\n";
3603}
3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3174} 3631}
3175 3632
3176sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3177 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3646 (async {
3181 Event::one_event; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3648 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3183 }; 3650 };
3184 3651
3652 evthread_start IO::AIO::poll_fileno;
3653
3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663 cf::load_materials;
3664
3665 reload_resources;
3185 reload_config; 3666 reload_config;
3186 db_init; 3667 db_init;
3668
3669 cf::init_uuid;
3670 cf::init_signals;
3671 cf::init_skills;
3672
3673 cf::init_beforeplay;
3674
3675 atomic;
3676
3187 load_extensions; 3677 load_extensions;
3188 3678
3189 $TICK_WATCHER->start; 3679 utime time, time, $RUNTIMEFILE;
3190 Event::loop; 3680
3681 # no (long-running) fork's whatsoever before this point(!)
3682 use POSIX ();
3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684
3685 (pop @POST_INIT)->(0) while @POST_INIT;
3686 };
3687
3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3696 goto &main_loop;
3191} 3697}
3192 3698
3193############################################################################# 3699#############################################################################
3194# initialisation and cleanup 3700# initialisation and cleanup
3195 3701
3196# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3197BEGIN { 3703BEGIN {
3704 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3206 },
3207 ); 3708 };
3208 } 3709 }
3209} 3710}
3210 3711
3211sub write_runtime { 3712sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime"; 3713 my $t0 = AE::time;
3213 3714
3214 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3216 3717
3217 IO::AIO::aio_utime $runtime, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3719
3219 my $guard = cf::lock_acquire "write_runtime"; 3720 my $guard = cf::lock_acquire "write_runtime";
3220 3721
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3722 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3222 or return; 3723 or return;
3223 3724
3224 my $value = $cf::RUNTIME + 90 + 10; 3725 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3726 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3727 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3737 aio_utime $fh, undef, undef;
3237 3738
3238 close $fh 3739 close $fh
3239 or return; 3740 or return;
3240 3741
3241 aio_rename "$runtime~", $runtime 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3743 and return;
3243 3744
3244 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3245 3746
3246 1 3747 1
3748}
3749
3750our $uuid_lock;
3751our $uuid_skip;
3752
3753sub write_uuid_sync($) {
3754 $uuid_skip ||= $_[0];
3755
3756 return if $uuid_lock;
3757 local $uuid_lock = 1;
3758
3759 my $uuid = "$LOCALDIR/uuid";
3760
3761 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3762 or return;
3763
3764 my $value = uuid_seq uuid_cur;
3765
3766 unless ($value) {
3767 info "cowardly refusing to write zero uuid value!\n";
3768 return;
3769 }
3770
3771 my $value = uuid_str $value + $uuid_skip;
3772 $uuid_skip = 0;
3773
3774 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3775 and return;
3776
3777 # always fsync - this file is important
3778 aio_fsync $fh
3779 and return;
3780
3781 close $fh
3782 or return;
3783
3784 aio_rename "$uuid~", $uuid
3785 and return;
3786
3787 trace "uuid file written ($value).\n";
3788
3789 1
3790
3791}
3792
3793sub write_uuid($$) {
3794 my ($skip, $sync) = @_;
3795
3796 $sync ? write_uuid_sync $skip
3797 : async { write_uuid_sync $skip };
3247} 3798}
3248 3799
3249sub emergency_save() { 3800sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3251 3802
3252 warn "enter emergency perl save\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3253 3809
3254 cf::sync_job { 3810 cf::sync_job {
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3255 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3256 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3257 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3259 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3819 $pl->valid or next;
3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3821 $pl->save;
3263 } 3822 }
3264 warn "end emergency player save\n"; 3823 info "emergency_perl_save: end player save\n";
3265 3824
3266 warn "begin emergency map save\n"; 3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 info "emergency_perl_save: begin map save\n";
3267 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3268 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3269 $map->valid or next; 3830 $map->valid or next;
3270 $map->save; 3831 $map->save;
3271 } 3832 }
3272 warn "end emergency map save\n"; 3833 info "emergency_perl_save: end map save\n";
3273 3834
3274 warn "begin emergency database checkpoint\n"; 3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 info "emergency_perl_save: begin database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3840
3841 info "emergency_perl_save: begin write uuid\n";
3842 write_uuid_sync 1;
3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3277 }; 3863 };
3278 3864
3279 warn "leave emergency perl save\n"; 3865 info "emergency_perl_save: leave\n";
3280} 3866}
3281 3867
3282sub post_cleanup { 3868sub post_cleanup {
3283 my ($make_core) = @_; 3869 my ($make_core) = @_;
3284 3870
3871 IO::AIO::flush;
3872
3285 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3874 if $make_core;
3875
3876 my $fh = pidfile;
3877 unlink $PIDFILE if <$fh> == $$;
3878}
3879
3880# a safer delete_package, copied from Symbol
3881sub clear_package($) {
3882 my $pkg = shift;
3883
3884 # expand to full symbol table name if needed
3885 unless ($pkg =~ /^main::.*::$/) {
3886 $pkg = "main$pkg" if $pkg =~ /^::/;
3887 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3888 $pkg .= '::' unless $pkg =~ /::$/;
3889 }
3890
3891 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3892 my $stem_symtab = *{$stem}{HASH};
3893
3894 defined $stem_symtab and exists $stem_symtab->{$leaf}
3895 or return;
3896
3897 # clear all symbols
3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3899 for my $name (keys %$leaf_symtab) {
3900 _gv_clear *{"$pkg$name"};
3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3902 }
3287} 3903}
3288 3904
3289sub do_reload_perl() { 3905sub do_reload_perl() {
3290 # can/must only be called in main 3906 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3292 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3293 return; 3909 return;
3294 } 3910 }
3295 3911
3912 return if $RELOAD++;
3913
3914 my $t1 = AE::time;
3915
3916 while ($RELOAD) {
3296 warn "reloading..."; 3917 info "reloading...";
3297 3918
3298 warn "entering sync_job"; 3919 trace "entering sync_job";
3299 3920
3300 cf::sync_job { 3921 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark
3302 cf::emergency_save; 3922 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark
3304 3923
3305 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV;
3307
3308 # if anything goes wrong in here, we should simply crash as we already saved
3309
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs;
3321 warn "iterate...";
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = (); 3926 %EXT_CORO = ();
3329 3927
3330 warn "removing commands"; 3928 trace "removing commands";
3331 %COMMAND = (); 3929 %COMMAND = ();
3332 3930
3333 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3334 %EXTCMD = (); 3932 %EXTCMD = ();
3335 %EXTICMD = (); 3933 %EXTICMD = ();
3336 3934
3337 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3340 3938
3341 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3342 eval { 3940 eval {
3343 $cb->($pkg); 3941 $cb->($pkg);
3344 1 3942 1
3345 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3944 }
3945
3946 trace "... clearing $pkg";
3947 clear_package $pkg;
3346 } 3948 }
3347 3949
3348 warn "... nuking $pkg";
3349 Symbol::delete_package $pkg;
3350 }
3351
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3353 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3953
3356 warn "... unloading $k"; 3954 trace "... unloading $k";
3357 delete $INC{$k}; 3955 delete $INC{$k};
3358 3956
3359 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3361 3959
3362 if (my $cb = $k->can ("unload_module")) { 3960 if (my $cb = $k->can ("unload_module")) {
3363 $cb->(); 3961 $cb->();
3962 }
3963
3964 clear_package $k;
3364 } 3965 }
3365 3966
3366 Symbol::delete_package $k;
3367 }
3368
3369 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3968 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3970
3373 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3376 3974
3377 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3976 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3380 3978
3381 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3382 3980
3383 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3384 require cf; 3982 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3386 3984
3387 warn "loading config and database again"; 3985 trace "loading config and database again";
3388 cf::reload_config; 3986 cf::reload_config;
3389 3987
3390 warn "loading extensions"; 3988 trace "loading extensions";
3391 cf::load_extensions; 3989 cf::load_extensions;
3392 3990
3991 if ($REATTACH_ON_RELOAD) {
3393 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3998 }
3399 3999
4000 trace "running post_init jobs";
4001 (pop @POST_INIT)->(1) while @POST_INIT;
4002
3400 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3401 4004
3402 1 4005 1
3403 } or do { 4006 } or do {
3404 warn $@; 4007 error $@;
3405 warn "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3406 exit 1; 4009 };
4010
4011 info "reloaded";
4012 --$RELOAD;
3407 }; 4013 }
3408 4014
3409 warn "reloaded"; 4015 $t1 = AE::time - $t1;
4016 info "reload completed in ${t1}s\n";
3410}; 4017};
3411 4018
3412our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3413 4020
3414sub reload_perl() { 4021sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 4022 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3417 4024
3418 $RELOAD_WATCHER ||= Event->timer ( 4025 $RELOAD_WATCHER ||= cf::async {
3419 reentrant => 0, 4026 Coro::AIO::aio_wait cache_extensions;
3420 after => 0, 4027
3421 data => WF_AUTOCANCEL, 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3422 cb => sub {
3423 do_reload_perl; 4029 do_reload_perl;
3424 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
3425 }, 4031 };
3426 ); 4032 };
3427} 4033}
3428 4034
3429register_command "reload" => sub { 4035register_command "reload" => sub {
3430 my ($who, $arg) = @_; 4036 my ($who, $arg) = @_;
3431 4037
3432 if ($who->flag (FLAG_WIZ)) { 4038 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 4039 $who->message ("reloading server.");
4040 async {
4041 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 4042 reload_perl;
4043 };
3435 } 4044 }
3436}; 4045};
3437 4046
3438unshift @INC, $LIBDIR; 4047#############################################################################
3439 4048
3440my $bug_warning = 0; 4049my $bug_warning = 0;
3441 4050
3442our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
3444 4053
3445sub wait_for_tick { 4054sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3448 4056
3449 my $signal = new Coro::Signal; 4057 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 4058 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 4059 $signal->wait;
3452} 4060}
3453 4061
3454sub wait_for_tick_begin { 4062sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3457 4064
3458 my $signal = new Coro::Signal; 4065 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 4066 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 4067 $signal->wait;
3461} 4068}
3462 4069
3463our $stat_fh; 4070sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 4071 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4072 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 4073 unless ++$bug_warning > 10;
3476 return; 4074 return;
3477 } 4075 }
3478 4076
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3484 4078
3485 $RUNTIME += $TICK; 4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3486 $NEXT_TICK += $TICK;
3487 4080
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 4083 Coro::async_pool {
4084 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 4085 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3493 };
3494 } 4087 };
4088 }
3495 4089
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 4091 $sig->send;
3501 } 4092 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 4093 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 4094 $sig->send;
3504 } 4095 }
3505 4096
3506 $NOW = Event::time; 4097 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4098 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 4099
3517 _post_tick; 4100 if (0) {
3518 4101 if ($NEXT_TICK) {
3519 # gather some statistics#d# 4102 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 4104 debug "jitter $JITTER\n";#d#
4105 }
3522 }, 4106 }
3523); 4107}
3524 4108
3525{ 4109{
4110 # configure BDB
4111
3526 BDB::min_parallel 8; 4112 BDB::min_parallel 16;
3527 BDB::max_poll_time $TICK * 0.1; 4113 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 4114 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 4115
3552 unless ($DB_ENV) { 4116 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 4117 $DB_ENV = BDB::db_env_create;
4118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4119 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4120 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4121 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4122 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 4123
3555 cf::sync_job { 4124 cf::sync_job {
3556 eval { 4125 eval {
3557 BDB::db_env_open 4126 BDB::db_env_open
3558 $DB_ENV, 4127 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4129 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4130 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 4131 0666;
3563 4132
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4133 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 4134 };
3570 4135
3571 cf::cleanup "db_env_open(db): $@" if $@; 4136 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 4137 };
3573 } 4138 }
3574 4139
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4140 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 4141 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 4142 };
3578 hard => 1, 4143 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4144 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 4145 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 4146 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4147 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 4148 };
3595} 4149}
3596 4150
3597{ 4151{
4152 # configure IO::AIO
4153
3598 IO::AIO::min_parallel 8; 4154 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 4155 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 4156 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 4157}
3611 4158
3612my $_log_backtrace; 4159my $_log_backtrace;
3613 4160
3614sub _log_backtrace { 4161sub _log_backtrace {
3617 $msg =~ s/\n//; 4164 $msg =~ s/\n//;
3618 4165
3619 # limit the # of concurrent backtraces 4166 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 4167 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 4168 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg;
3622 async { 4170 async {
4171 $Coro::current->{desc} = "abt $msg";
4172
3623 my @bt = fork_call { 4173 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 4174 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4175 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4176 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 4177 or die "addr2line: $!";
3635 } 4185 }
3636 4186
3637 @funcs 4187 @funcs
3638 }; 4188 };
3639 4189
3640 LOG llevInfo, "[ABT] $msg\n"; 4190 LOG llevInfo, "[ABT] $perl_bt\n";
4191 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 4193 --$_log_backtrace;
3643 }; 4194 };
3644 } else { 4195 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3646 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [suppressed]\n";
3647 } 4198 }
3648} 4199}
3649 4200
3650# load additional modules 4201# load additional modules
3651use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3652 4204
3653END { cf::emergency_save } 4205END { cf::emergency_save }
3654 4206
36551 42071
3656 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines