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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines