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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines