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.377 by root, Thu Oct 4 11:36:38 2007 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines