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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines