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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines