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.348 by root, Thu Aug 30 08:34:40 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; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # 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;
290 400
291sub lock_wait($) { 401sub lock_wait($) {
292 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
293
294 # wait for lock, if any
295 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule;
298 }
299} 403}
300 404
301sub lock_acquire($) { 405sub lock_acquire($) {
302 my ($key) = @_; 406 $LOCKS->guard ($_[0])
303
304 # wait, to be sure we are not locked
305 lock_wait $key;
306
307 $LOCK{$key} = [];
308
309 Coro::guard {
310 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} };
312 }
313} 407}
314 408
315sub lock_active($) { 409sub lock_active($) {
316 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 411}
320 412
321sub freeze_mainloop { 413sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
323 415
324 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 417}
326 }; 418
327 $TICK_WATCHER->stop; 419=item cf::periodic $interval, $cb
328 $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
329} 432}
330 433
331=item cf::get_slot $time[, $priority[, $name]] 434=item cf::get_slot $time[, $priority[, $name]]
332 435
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 436Allocate $time seconds of blocking CPU time at priority C<$priority>:
341 444
342=cut 445=cut
343 446
344our @SLOT_QUEUE; 447our @SLOT_QUEUE;
345our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
346 450
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
453 $Coro::current->desc ("timeslot manager");
454
349 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
350 457
351 while () { 458 while () {
352 next_job: 459 next_job:
460
353 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
354 if ($avail > 0.01) { 462
355 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
357 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send; 467 $job->[2]->send;
359 Coro::cede; 468 Coro::cede;
360 goto next_job; 469 goto next_job;
361 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
362 } 472 }
363 } 473 }
364 474
365 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 478 $signal->wait;
369 } else { 479 } else {
480 $busy = 0;
370 Coro::schedule; 481 Coro::schedule;
371 } 482 }
372 } 483 }
373}; 484};
374 485
375sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
376 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
377 490
378 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
379 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
380 494
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
394 508
395BEGIN { *async = \&Coro::async_pool } 509BEGIN { *async = \&Coro::async_pool }
396 510
397=item cf::sync_job { BLOCK } 511=item cf::sync_job { BLOCK }
398 512
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 513The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 514is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 516acceptable.
403 517
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 519the given BLOCK in another coroutine while waiting for the result. The
409=cut 523=cut
410 524
411sub sync_job(&) { 525sub sync_job(&) {
412 my ($job) = @_; 526 my ($job) = @_;
413 527
414 if ($Coro::current == $Coro::main) { 528 if (in_main) {
415 my $time = Event::time; 529 my $time = AE::time;
416 530
417 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
419 533
420 # TODO: use suspend/resume instead 534 #LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 535
422 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
423 537
424 my $busy = 1; 538 my $busy = 1;
425 my @res; 539 my @res;
426 540
427 (async { 541 (async {
542 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 543 @res = eval { $job->() };
429 warn $@ if $@; 544 error $@ if $@;
430 undef $busy; 545 undef $busy;
431 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
432 547
433 while ($busy) { 548 while ($busy) {
434 Coro::cede or Event::one_event; 549 if (Coro::nready) {
550 Coro::cede_notself;
551 } else {
552 EV::loop EV::LOOP_ONESHOT;
435 } 553 }
554 }
436 555
437 $time = Event::time - $time; 556 my $time = AE::time - $time;
438 557
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
443 559
444 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
445 } else { 561 } else {
446 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
447 563
472=item fork_call { }, $args 588=item fork_call { }, $args
473 589
474Executes the given code block with the given arguments in a seperate 590Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 591process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 593never block itself or use any form of event handling.
478 594
479=cut 595=cut
480 596
481sub fork_call(&@) { 597sub fork_call(&@) {
482 my ($cb, @args) = @_; 598 my ($cb, @args) = @_;
483 599
484 # we seemingly have to make a local copy of the whole thing, 600 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 601 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 602 # TODO: investigate and fix (likely this will be rather laborious)
487 603
488 my @res = Coro::Util::fork_eval { 604 my @res = Coro::Util::fork_eval {
489 reset_signals; 605 reset_signals;
490 &$cb 606 &$cb
491 }, @args; 607 }, @args;
492 608
493 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
494} 610}
495 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
496=item $value = cf::db_get $family => $key 650=item $value = cf::db_get $family => $key
497 651
498Returns a single value from the environment database. 652Returns a single value from the environment database.
499 653
500=item cf::db_put $family => $key => $value 654=item cf::db_put $family => $key => $value
501 655
502Stores 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
503data 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).
504 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
505=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}
506 685
507our $DB; 686our $DB;
508 687
509sub db_init { 688sub db_init {
510 unless ($DB) { 689 $DB ||= db_table "db";
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 }
524} 690}
525 691
526sub db_get($$) { 692sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
528 694
529 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
530 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
531 699
532 $! ? () 700 $! ? ()
533 : $data 701 : $data
534 }
535} 702}
536 703
537sub db_put($$$) { 704sub db_put($$$) {
538 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
595 762
596 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data); 764 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
599 766
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
601 768
602 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
605 772
615 782
616=cut 783=cut
617 784
618sub datalog($@) { 785sub datalog($@) {
619 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
621} 788}
622 789
623=back 790=back
624 791
625=cut 792=cut
626 793
627############################################################################# 794#############################################################################
628 795
629=head2 ATTACHABLE OBJECTS 796=head2 ATTACHABLE OBJECTS
630 797
631Many 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
632attach callbacks/event handlers (a collection of which is called an "attachment") 799attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 800to it. All such attachable objects support the following methods.
634 801
635In 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>
636C<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
637Crossfire TRT). 804Deliantra).
638 805
639=over 4 806=over 4
640 807
641=item $attachable->attach ($attachment, key => $value...) 808=item $attachable->attach ($attachment, key => $value...)
642 809
686=item cf::CLASS::attachment $name, ... 853=item cf::CLASS::attachment $name, ...
687 854
688Register an attachment by C<$name> through which attachable objects of the 855Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 856given CLASS can refer to this attachment.
690 857
691Some classes such as crossfire maps and objects can specify attachments 858Some classes such as deliantra maps and objects can specify attachments
692that 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.
693 860
694These calls expect any number of the following handler/hook descriptions: 861These calls expect any number of the following handler/hook descriptions:
695 862
696=over 4 863=over 4
820 987
821 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
822 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
823 990
824 } elsif (ref $type) { 991 } elsif (ref $type) {
825 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
826 993
827 } else { 994 } else {
828 shift @arg; 995 shift @arg;
829 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
830 } 997 }
831 } 998 }
832} 999}
833 1000
834sub _object_attach { 1001sub _object_attach {
844 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
845 } 1012 }
846 1013
847 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
848 } else { 1015 } else {
849 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
850 } 1017 }
851 1018
852 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
853} 1020}
854 1021
913 1080
914 for (@$callbacks) { 1081 for (@$callbacks) {
915 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
916 1083
917 if ($@) { 1084 if ($@) {
918 warn "$@";
919 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
920 override; 1086 override;
921 } 1087 }
922 1088
923 return 1 if $override; 1089 return 1 if $override;
924 } 1090 }
925 1091
926 0 1092 0
927} 1093}
928 1094
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1095=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1096
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1097=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1098
933Generate an object-specific event with the given arguments. 1099Generate an object-specific event with the given arguments.
934 1100
940 1106
941=cut 1107=cut
942 1108
943############################################################################# 1109#############################################################################
944# object support 1110# object support
945#
946 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#
947sub _can_merge { 1145sub _can_merge {
948 my ($ob1, $ob2) = @_; 1146 my ($ob1, $ob2) = @_;
949 1147
950 local $Storable::canonical = 1; 1148 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1149
954 $fob1 eq $fob2 1150 # we do the slow way here
1151 return _object_equal $ob1, $ob2
955} 1152}
956 1153
957sub reattach { 1154sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1155 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1156 my ($obj) = @_;
960 1157
1158 # no longer needed after getting rid of delete_package?
961 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
962 1160
963 my $registry = $obj->registry; 1161 my $registry = $obj->registry;
964 1162
965 @$registry = (); 1163 @$registry = ();
966 1164
971 for (@$attach) { 1169 for (@$attach) {
972 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
973 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
974 } 1172 }
975 } else { 1173 } else {
976 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
977 } 1175 }
978 } 1176 }
979} 1177}
980 1178
981cf::attachable->attach ( 1179cf::attachable->attach (
982 prio => -1000000, 1180 prio => -1000000,
983 on_instantiate => sub { 1181 on_instantiate => sub {
984 my ($obj, $data) = @_; 1182 my ($obj, $data) = @_;
985 1183
986 $data = from_json $data; 1184 $data = decode_json $data;
987 1185
988 for (@$data) { 1186 for (@$data) {
989 my ($name, $args) = @$_; 1187 my ($name, $args) = @$_;
990 1188
991 $obj->attach ($name, %{$args || {} }); 1189 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1205sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1009 1207
1010 sync_job { 1208 sync_job {
1011 if (length $$rdata) { 1209 if (length $$rdata) {
1210 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1014 1214
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1216 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 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 }
1019 close $fh; 1222 aio_close $fh;
1020 1223
1021 if (@$objs) { 1224 if (@$objs) {
1022 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) {
1023 chmod SAVE_MODE, $fh; 1226 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1026 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 }
1027 close $fh; 1233 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1235 }
1030 } else { 1236 } else {
1031 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1032 } 1238 }
1033 1239
1034 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1241
1242 $filename =~ s%/[^/]+$%%;
1243 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1244 } else {
1036 warn "FATAL: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1037 } 1246 }
1038 } else { 1247 } else {
1039 aio_unlink $filename; 1248 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1041 } 1250 }
1042 } 1251 };
1043} 1252}
1044 1253
1045sub object_freezer_as_string { 1254sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1255 my ($rdata, $objs) = @_;
1047 1256
1059 or return; 1268 or return;
1060 1269
1061 unless (aio_stat "$filename.pst") { 1270 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1271 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1272 or return;
1273
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1274 my $st = eval { Coro::Storable::thaw $av };
1275 $av = $st->{objs};
1065 } 1276 }
1066 1277
1278 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1282
1069 return ($data, $av); 1283 ($data, $av)
1070} 1284}
1071 1285
1072=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
1073 1287
1074=over 4 1288=over 4
1128 my ($name, $cb) = @_; 1342 my ($name, $cb) = @_;
1129 1343
1130 $EXTICMD{$name} = $cb; 1344 $EXTICMD{$name} = $cb;
1131} 1345}
1132 1346
1347use File::Glob ();
1348
1133cf::player->attach ( 1349cf::player->attach (
1134 on_command => sub { 1350 on_unknown_command => sub {
1135 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1136 1352
1137 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1138 or return; 1354 or return;
1139 1355
1162 1378
1163 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1164 if $reply; 1380 if $reply;
1165 1381
1166 } else { 1382 } else {
1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1168 } 1384 }
1169 1385
1170 cf::override; 1386 cf::override;
1171 }, 1387 },
1172); 1388);
1173 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
1174sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1175 cf::sync_job { 1406 cf::sync_job {
1176 my %todo; 1407 my %todo;
1177 1408
1178 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1179 next unless -r $path; 1410 next unless -r $path;
1197 1428
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1431
1201 $ext{source} = 1432 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1203 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1204 . $source 1435 . $source
1205 . "\n};\n1"; 1436 . "\n};\n1";
1206 1437
1207 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1208 } 1439 }
1209 1440
1441 my $pass = 0;
1210 my %done; 1442 my %done;
1211 while (%todo) { 1443 while (%todo) {
1212 my $progress; 1444 my $progress;
1213 1445
1446 ++$pass;
1447
1448 ext:
1214 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip 1451 next ext
1217 unless exists $done{$_}; 1452 unless exists $done{$_};
1218 } 1453 }
1219 1454
1220 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1221 1456
1222 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1223 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1224 : "$v->{base}: extension inactive.\n";
1225 1461
1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1226 if (exists $v->{meta}{mandatory}) { 1463 if exists $v->{meta}{mandatory};
1227 warn $msg; 1464
1228 warn "mandatory extension failed to load, exiting.\n"; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1229 exit 1; 1466 delete $todo{$k};
1230 } 1467 } else {
1231 1468 $done{$k} = delete $todo{$k};
1232 warn $msg; 1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1233 } 1474 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
1238 } 1475 }
1239 1476
1240 skip: 1477 unless ($progress) {
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1242 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 }
1243 } 1485 }
1244 }; 1486 };
1245} 1487}
1246 1488
1247############################################################################# 1489#############################################################################
1248 1490
1249=back 1491=back
1250 1492
1251=head2 CORE EXTENSIONS 1493=head2 CORE EXTENSIONS
1252 1494
1253Functions and methods that extend core crossfire objects. 1495Functions and methods that extend core deliantra objects.
1254 1496
1255=cut 1497=cut
1256 1498
1257package cf::player; 1499package cf::player;
1258 1500
1259use Coro::AIO; 1501use Coro::AIO;
1260 1502
1261=head3 cf::player 1503=head3 cf::player
1262 1504
1263=over 4 1505=over 4
1506
1507=item cf::player::num_playing
1508
1509Returns the official number of playing players, as per the Crossfire metaserver rules.
1510
1511=cut
1512
1513sub num_playing {
1514 scalar grep
1515 $_->ob->map
1516 && !$_->hidden
1517 && !$_->ob->flag (cf::FLAG_WIZ),
1518 cf::player::list
1519}
1264 1520
1265=item cf::player::find $login 1521=item cf::player::find $login
1266 1522
1267Returns the given player object, loading it if necessary (might block). 1523Returns the given player object, loading it if necessary (might block).
1268 1524
1287 1543
1288sub exists($) { 1544sub exists($) {
1289 my ($login) = @_; 1545 my ($login) = @_;
1290 1546
1291 $cf::PLAYER{$login} 1547 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1548 or !aio_stat path $login
1293} 1549}
1294 1550
1295sub find($) { 1551sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1552 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1553 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1560 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1561 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1562 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1563 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1564
1309 my $pl = load_pl path $login 1565 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1566 or return;
1567
1568 my $pl = cf::player::load_pl $f
1569 or return;
1570
1571 local $cf::PLAYER_LOADING{$login} = $pl;
1572 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1312 } 1574 }
1313 } 1575 }
1314} 1576}
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);
1315 1590
1316sub save($) { 1591sub save($) {
1317 my ($pl) = @_; 1592 my ($pl) = @_;
1318 1593
1319 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1323 1598
1324 return if $pl->{deny_save}; 1599 return if $pl->{deny_save};
1325 1600
1326 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1327 $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];
1328 1608
1329 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1610 cf::cede_to_tick;
1331} 1611}
1332 1612
1364 my ($pl) = @_; 1644 my ($pl) = @_;
1365 1645
1366 my $name = $pl->ob->name; 1646 my $name = $pl->ob->name;
1367 1647
1368 $pl->{deny_save} = 1; 1648 $pl->{deny_save} = 1;
1369 $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
1370 1650
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1652 $pl->deactivate;
1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1375 1656
1376 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1694 or return [];
1414 1695
1415 my @logins; 1696 my @logins;
1416 1697
1417 for my $login (@$dirs) { 1698 for my $login (@$dirs) {
1699 my $path = path $login;
1700
1701 # a .pst is a dead give-away for a valid player
1702 # if no pst file found, open and chekc for blocked users
1703 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1704 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1705 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1706 $buf !~ /^password -------------$/m or next; # official not-valid tag
1707 }
1421 1708
1422 utf8::decode $login; 1709 utf8::decode $login;
1423 push @logins, $login; 1710 push @logins, $login;
1424 } 1711 }
1425 1712
1426 \@logins 1713 \@logins
1427} 1714}
1428 1715
1429=item $player->maps 1716=item $player->maps
1717
1718=item cf::player::maps $login
1430 1719
1431Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1432player. May block. 1721player. May block.
1433 1722
1434=cut 1723=cut
1452 } 1741 }
1453 1742
1454 \@paths 1743 \@paths
1455} 1744}
1456 1745
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1746=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1747
1459Expand crossfire pod fragments into protocol xml. 1748Expand deliantra pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506 1749
1507=item $player->ext_reply ($msgid, @msg) 1750=item $player->ext_reply ($msgid, @msg)
1508 1751
1509Sends an ext reply to the player. 1752Sends an ext reply to the player.
1510 1753
1542 1785
1543=cut 1786=cut
1544 1787
1545sub find_by_path($) { 1788sub find_by_path($) {
1546 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1547 1792
1548 my ($match, $specificity); 1793 my ($match, $specificity);
1549 1794
1550 for my $region (list) { 1795 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1577our $MAX_RESET = 3600; 1822our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1823our $DEFAULT_RESET = 3000;
1579 1824
1580sub generate_random_map { 1825sub generate_random_map {
1581 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
1582 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1831 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1587 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1588 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1589 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1590 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1605 1853
1606sub register { 1854sub register {
1607 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1608 my $pkg = caller; 1856 my $pkg = caller;
1609 1857
1610 no strict;
1611 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1612 1859
1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1614} 1861}
1615 1862
1616# also paths starting with '/' 1863# also paths starting with '/'
1617$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1618 1865
1619sub thawer_merge { 1866sub thawer_merge {
1620 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1621 1868
1622 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
1627} 1874}
1628 1875
1629sub normalise { 1876sub normalise {
1630 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1631 1878
1632 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1633 1880
1634 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1635 1882
1636 # map plan: 1883 # map plan:
1637 # 1884 #
1676 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1677 return $self; 1924 return $self;
1678 } 1925 }
1679 } 1926 }
1680 1927
1681 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1682 () 1929 ()
1683} 1930}
1684 1931
1685sub init { 1932sub init {
1686 my ($self) = @_; 1933 my ($self) = @_;
1708 1955
1709# the temporary/swap location 1956# the temporary/swap location
1710sub save_path { 1957sub save_path {
1711 my ($self) = @_; 1958 my ($self) = @_;
1712 1959
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1960 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1961 "$TMPDIR/$path.map"
1715} 1962}
1716 1963
1717# the unique path, undef == no special unique path 1964# the unique path, undef == no special unique path
1718sub uniq_path { 1965sub uniq_path {
1719 my ($self) = @_; 1966 my ($self) = @_;
1720 1967
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1968 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1969 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1970}
1733 1971
1734sub decay_objects { 1972sub decay_objects {
1735 my ($self) = @_; 1973 my ($self) = @_;
1736 1974
1749 1987
1750sub load_header_from($) { 1988sub load_header_from($) {
1751 my ($self, $path) = @_; 1989 my ($self, $path) = @_;
1752 1990
1753 utf8::encode $path; 1991 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1992 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1993 or return;
1994
1995 $self->_load_header ($f)
1996 or return;
1997
1998 local $MAP_LOADING{$self->{path}} = $self;
1999 $f->resolve_delayed_derefs;
1759 2000
1760 $self->{load_path} = $path; 2001 $self->{load_path} = $path;
1761 2002
1762 1 2003 1
1763} 2004}
1815 2056
1816sub find; 2057sub find;
1817sub find { 2058sub find {
1818 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
1819 2060
2061 cf::cede_to_tick;
2062
1820 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1821 2064
2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2067
1824 $cf::MAP{$path} || do { 2068 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2069 my $map = new_from_path cf::map $path
1827 or return; 2070 or return;
1828 2071
1829 $map->{last_save} = $cf::RUNTIME; 2072 $map->{last_save} = $cf::RUNTIME;
1830 2073
1832 or return; 2075 or return;
1833 2076
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2077 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2078 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2079 #$cf::WAIT_FOR_TICK->wait;
2080 undef $guard2;
2081 undef $guard1;
1837 $map->reset; 2082 $map->reset;
1838 undef $guard;
1839 return find $path; 2083 return find $path;
1840 } 2084 }
1841 2085
1842 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
1843 } 2087 }
1844} 2088}
1845 2089
1846sub pre_load { } 2090sub pre_load { }
1847sub post_load { } 2091#sub post_load { } # XS
1848 2092
1849sub load { 2093sub load {
1850 my ($self) = @_; 2094 my ($self) = @_;
1851 2095
1852 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
1853 2097
1854 my $path = $self->{path}; 2098 my $path = $self->{path};
1855 2099
1856 { 2100 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2101 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2102
2103 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2104 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2105
1862 $self->in_memory (cf::MAP_LOADING); 2106 $self->in_memory (cf::MAP_LOADING);
1863 2107
1864 $self->alloc; 2108 $self->alloc;
1865 2109
1866 $self->pre_load; 2110 $self->pre_load;
1867 cf::cede_to_tick; 2111 cf::cede_to_tick;
1868 2112
2113 my $f = new_from_file cf::object::thawer $self->{load_path};
2114 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2115 $self->_load_objects ($f)
1870 or return; 2116 or return;
1871 2117
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2118 $self->post_load_original
1873 if delete $self->{load_original}; 2119 if delete $self->{load_original};
1874 2120
1875 if (my $uniq = $self->uniq_path) { 2121 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2122 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2123 unless (aio_stat $uniq) {
2124 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2125 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2126 $self->_load_objects ($f);
2127 $f->resolve_delayed_derefs;
2128 }
1880 } 2129 }
1881 } 2130 }
2131
2132 $f->resolve_delayed_derefs;
1882 2133
1883 cf::cede_to_tick; 2134 cf::cede_to_tick;
1884 # now do the right thing for maps 2135 # now do the right thing for maps
1885 $self->link_multipart_objects; 2136 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2137 $self->difficulty ($self->estimate_difficulty)
1890 unless ($self->{deny_activate}) { 2141 unless ($self->{deny_activate}) {
1891 $self->decay_objects; 2142 $self->decay_objects;
1892 $self->fix_auto_apply; 2143 $self->fix_auto_apply;
1893 $self->update_buttons; 2144 $self->update_buttons;
1894 cf::cede_to_tick; 2145 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1897 $self->activate; 2146 $self->activate;
1898 } 2147 }
1899 2148
1900 $self->{last_save} = $cf::RUNTIME; 2149 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2150 $self->last_access ($cf::RUNTIME);
1902 2151
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2152 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2153 }
1905 2154
1906 $self->post_load; 2155 $self->post_load;
1907} 2156}
1908 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
1909sub customise_for { 2161sub customise_for {
1910 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
1911 2163
1912 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
1913 if $self->per_player; 2165 if $self->per_player;
1929 or next; 2181 or next;
1930 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
1931 or next; 2183 or next;
1932 $neigh->load; 2184 $neigh->load;
1933 2185
2186 # now find the diagonal neighbours
1934 push @neigh, 2187 push @neigh,
1935 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1936 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1937 } 2190 }
1938 2191
1945} 2198}
1946 2199
1947sub find_sync { 2200sub find_sync {
1948 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
1949 2202
1950 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
1951} 2207}
1952 2208
1953sub do_load_sync { 2209sub do_load_sync {
1954 my ($map) = @_; 2210 my ($map) = @_;
1955 2211
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
1958 2214
1959 cf::sync_job { $map->load }; 2215 $map->load;
1960} 2216}
1961 2217
1962our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
1963our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
1964 2220
1966 my ($path, $origin, $load) = @_; 2222 my ($path, $origin, $load) = @_;
1967 2223
1968 $path = normalise $path, $origin && $origin->{path}; 2224 $path = normalise $path, $origin && $origin->{path};
1969 2225
1970 if (my $map = $cf::MAP{$path}) { 2226 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2227 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2228 }
1973 2229
1974 $MAP_PREFETCH{$path} |= $load; 2230 $MAP_PREFETCH{$path} |= $load;
1975 2231
1976 $MAP_PREFETCHER ||= cf::async { 2232 $MAP_PREFETCHER ||= cf::async {
2233 $Coro::current->{desc} = "map prefetcher";
2234
1977 while (%MAP_PREFETCH) { 2235 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2236 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2237 if (my $map = find $k) {
1980 $map->load if $v; 2238 $map->load if $v;
1981 } 2239 }
1988 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
1989 2247
1990 () 2248 ()
1991} 2249}
1992 2250
2251# common code, used by both ->save and ->swapout
1993sub save { 2252sub _save {
1994 my ($self) = @_; 2253 my ($self) = @_;
1995
1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2254
1998 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
1999 2256
2000 return unless $self->dirty; 2257 return unless $self->dirty;
2001 2258
2007 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2008 2265
2009 local $self->{last_access} = $self->last_access;#d# 2266 local $self->{last_access} = $self->last_access;#d#
2010 2267
2011 cf::async { 2268 cf::async {
2269 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2270 $_->contr->save for $self->players;
2013 }; 2271 };
2272
2273 cf::get_slot 0.02;
2014 2274
2015 if ($uniq) { 2275 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2276 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2277 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2278 } else {
2019 $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);
2020 } 2280 }
2021} 2281}
2022 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2023sub swap_out { 2291sub swap_out {
2024 my ($self) = @_; 2292 my ($self) = @_;
2025 2293
2026 # save first because save cedes
2027 $self->save;
2028
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2295
2296 return if $self->in_memory != cf::MAP_ACTIVE;
2297 return if $self->{deny_save};
2031 return if $self->players; 2298 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save};
2034 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2035 $self->clear; 2309 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2310}
2038 2311
2039sub reset_at { 2312sub reset_at {
2040 my ($self) = @_; 2313 my ($self) = @_;
2041 2314
2059 2332
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2334
2062 return if $self->players; 2335 return if $self->players;
2063 2336
2064 warn "resetting map ", $self->path; 2337 cf::trace "resetting map ", $self->path, "\n";
2065 2338
2066 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2067 2340
2068 # need to save uniques path 2341 # need to save uniques path
2069 unless ($self->{deny_save}) { 2342 unless ($self->{deny_save}) {
2073 if $uniq; 2346 if $uniq;
2074 } 2347 }
2075 2348
2076 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2077 2350
2351 $self->deactivate;
2352 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2353 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2354
2082 $self->unlink_save; 2355 $self->unlink_save;
2083 $self->destroy; 2356 $self->destroy;
2084} 2357}
2085 2358
2086my $nuke_counter = "aaaa"; 2359my $nuke_counter = "aaaa";
2087 2360
2088sub nuke { 2361sub nuke {
2089 my ($self) = @_; 2362 my ($self) = @_;
2090 2363
2364 {
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2091 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2092 2368
2093 $self->unlink_save; 2369 $self->unlink_save;
2094 2370
2095 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2096 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2376
2101 $cf::MAP{$self->path} = $self; 2377 $cf::MAP{$self->path} = $self;
2378 }
2102 2379
2103 $self->reset; # polite request, might not happen 2380 $self->reset; # polite request, might not happen
2104} 2381}
2105 2382
2106=item $maps = cf::map::tmp_maps 2383=item $maps = cf::map::tmp_maps
2148 2425
2149sub unique_maps() { 2426sub unique_maps() {
2150 [ 2427 [
2151 map { 2428 map {
2152 utf8::decode $_; 2429 utf8::decode $_;
2153 /\.map$/ 2430 s/\.map$//; # TODO future compatibility hack
2431 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2432 ? ()
2154 ? normalise $_ 2433 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2435 ]
2158} 2436}
2159 2437
2160package 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}
2161 2469
2162=back 2470=back
2163 2471
2164=head3 cf::object 2472=head3 cf::object
2165 2473
2169 2477
2170=over 4 2478=over 4
2171 2479
2172=item $ob->inv_recursive 2480=item $ob->inv_recursive
2173 2481
2174Returns 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.
2175 2484
2176=cut 2485=cut
2177 2486
2178sub inv_recursive_; 2487sub inv_recursive_;
2179sub inv_recursive_ { 2488sub inv_recursive_ {
2182 2491
2183sub inv_recursive { 2492sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2493 inv_recursive_ inv $_[0]
2185} 2494}
2186 2495
2496=item $ref = $ob->ref
2497
2498Creates and returns a persistent reference to an object that can be stored as a string.
2499
2500=item $ob = cf::object::deref ($refstring)
2501
2502returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2503even if the object actually exists. May block.
2504
2505=cut
2506
2507sub deref {
2508 my ($ref) = @_;
2509
2510 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2511 my ($uuid, $name) = ($1, $2);
2512 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2513 or return;
2514 $pl->ob->uuid eq $uuid
2515 or return;
2516
2517 $pl->ob
2518 } else {
2519 warn "$ref: cannot resolve object reference\n";
2520 undef
2521 }
2522}
2523
2187package cf; 2524package cf;
2188 2525
2189=back 2526=back
2190 2527
2191=head3 cf::object::player 2528=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2534Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can 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
2199dialogue with the given NPC character. 2536dialogue with the given NPC character.
2200 2537
2201=cut 2538=cut
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};
2202 2553
2203# rough implementation of a future "reply" method that works 2554# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2555# with dialog boxes.
2205#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
2206sub cf::object::player::reply($$$;$) { 2557sub cf::object::player::reply($$$;$) {
2218 my $dialog = $pl->{npc_dialog}; 2569 my $dialog = $pl->{npc_dialog};
2219 $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));
2220 2571
2221 } else { 2572 } else {
2222 $msg = $npc->name . " says: $msg" if $npc; 2573 $msg = $npc->name . " says: $msg" if $npc;
2223 $self->message ($msg, $flags); 2574 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2224 } 2575 }
2225 } 2576 }
2226} 2577}
2227 2578
2228=item $object->send_msg ($channel, $msg, $color, [extra...]) 2579=item $object->send_msg ($channel, $msg, $color, [extra...])
2253 2604
2254=item $player_object->enter_link 2605=item $player_object->enter_link
2255 2606
2256Freezes 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}>).
2257 2608
2258The 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.
2259I<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.
2260 2613
2261Will never block. 2614Will never block.
2262 2615
2263=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
2264 2617
2284sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2285 my ($self) = @_; 2638 my ($self) = @_;
2286 2639
2287 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2288 2641
2642 ++$self->{_link_recursion};
2643
2289 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2290 2645
2291 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2292 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2293 2648
2294 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2295} 2650}
2296 2651
2297sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2298 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2299 2654
2316 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2317 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2318 2673
2319 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2320 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2321 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2322 2677
2323 $map->load; 2678 $map->load;
2324 $map->load_neighbours; 2679 $map->load_neighbours;
2325 2680
2326 return unless $self->contr->active; 2681 return unless $self->contr->active;
2327 $self->activate_recursive;
2328 2682
2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2330 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2331} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2332 2690
2691}
2692
2333=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)]])
2334 2694
2335Moves 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
2336her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2337that 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
2338the 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
2339be called at the end of this process. 2699be called at the end of this process.
2340 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
2341=cut 2704=cut
2342 2705
2343our $GOTOGEN; 2706our $GOTOGEN;
2344 2707
2345sub cf::object::player::goto { 2708sub cf::object::player::goto {
2346 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2347 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
2348 # 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
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2719
2351 $self->enter_link; 2720 $self->enter_link;
2352 2721
2353 (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
2354 my $map = eval { 2744 my $map = eval {
2355 my $map = cf::map::find $path; 2745 my $map = defined $path ? cf::map::find $path : undef;
2356 2746
2357 if ($map) { 2747 if ($map) {
2358 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2360 } else { 2750 } else {
2361 $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);
2362 } 2752 }
2363 2753
2364 $map 2754 $map
2365 }; 2755 };
2366 2756
2372 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2373 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2374 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2375 } 2765 }
2376 2766
2377 $done->() if $done; 2767 $done->($self) if $done;
2378 })->prio (1); 2768 })->prio (1);
2379} 2769}
2380 2770
2381=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2382 2772
2402} 2792}
2403 2793
2404sub prepare_random_map { 2794sub prepare_random_map {
2405 my ($exit) = @_; 2795 my ($exit) = @_;
2406 2796
2407 my $guard = cf::lock_acquire "exit_prepare:$exit";
2408
2409 # all this does is basically replace the /! path by 2797 # all this does is basically replace the /! path by
2410 # a new random map path (?random/...) with a seed 2798 # a new random map path (?random/...) with a seed
2411 # that depends on the exit object 2799 # that depends on the exit object
2412 2800
2413 my $rmp = parse_random_map_params $exit->msg; 2801 my $rmp = parse_random_map_params $exit->msg;
2415 if ($exit->map) { 2803 if ($exit->map) {
2416 $rmp->{region} = $exit->region->name; 2804 $rmp->{region} = $exit->region->name;
2417 $rmp->{origin_map} = $exit->map->path; 2805 $rmp->{origin_map} = $exit->map->path;
2418 $rmp->{origin_x} = $exit->x; 2806 $rmp->{origin_x} = $exit->x;
2419 $rmp->{origin_y} = $exit->y; 2807 $rmp->{origin_y} = $exit->y;
2808
2809 $exit->map->touch;
2420 } 2810 }
2421 2811
2422 $rmp->{random_seed} ||= $exit->random_seed; 2812 $rmp->{random_seed} ||= $exit->random_seed;
2423 2813
2424 my $data = cf::to_json $rmp; 2814 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2425 my $md5 = Digest::MD5::md5_hex $data; 2815 my $md5 = Digest::MD5::md5_hex $data;
2426 my $meta = "$RANDOMDIR/$md5.meta"; 2816 my $meta = "$RANDOMDIR/$md5.meta";
2427 2817
2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2818 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2429 aio_write $fh, 0, (length $data), $data, 0; 2819 aio_write $fh, 0, (length $data), $data, 0;
2430 undef $fh; 2820 undef $fh;
2431 aio_rename "$meta~", $meta; 2821 aio_rename "$meta~", $meta;
2432 2822
2823 my $slaying = "?random/$md5";
2824
2825 if ($exit->valid) {
2433 $exit->slaying ("?random/$md5"); 2826 $exit->slaying ("?random/$md5");
2434 $exit->msg (undef); 2827 $exit->msg (undef);
2828 }
2435 } 2829 }
2436} 2830}
2437 2831
2438sub cf::object::player::enter_exit { 2832sub cf::object::player::enter_exit {
2439 my ($self, $exit) = @_; 2833 my ($self, $exit) = @_;
2440 2834
2441 return unless $self->type == cf::PLAYER; 2835 return unless $self->type == cf::PLAYER;
2442 2836
2443 if ($exit->slaying eq "/!") {
2444 #TODO: this should de-fi-ni-te-ly not be a sync-job
2445 # the problem is that $exit might not survive long enough
2446 # so it needs to be done right now, right here
2447 cf::sync_job { prepare_random_map $exit };
2448 }
2449
2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2451 my $hp = $exit->stats->hp;
2452 my $sp = $exit->stats->sp;
2453
2454 $self->enter_link; 2837 $self->enter_link;
2455 2838
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
2459
2460 (async { 2839 (async {
2461 $self->deactivate_recursive; # just to be sure 2840 $Coro::current->{desc} = "enter_exit";
2841
2462 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
2463 $self->goto ($slaying, $hp, $sp); 2857 $self->goto ($map, $x, $y);
2464 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
2465 1; 2863 1
2466 }) { 2864 }) {
2467 $self->message ("Something went wrong deep within the crossfire server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2468 . "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. "
2469 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2470 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2471 2869
2472 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2473 $self->leave_link; 2871 $self->leave_link;
2474 } 2872 }
2475 })->prio (1); 2873 })->prio (1);
2476} 2874}
2477 2875
2489sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2490 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2491 2889
2492 utf8::encode $text; 2890 utf8::encode $text;
2493 $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);
2494} 2917}
2495 2918
2496=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2497 2920
2498Send 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
2500the 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
2501the message unless the client supports the msg packet. 2924the message unless the client supports the msg packet.
2502 2925
2503=cut 2926=cut
2504 2927
2928# non-persistent channels (usually the info channel)
2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2936 "c/identify" => {
2937 id => "infobox",
2938 title => "Identify",
2939 reply => undef,
2940 tooltip => "Items recently identified",
2941 },
2942 "c/examine" => {
2943 id => "infobox",
2944 title => "Examine",
2945 reply => undef,
2946 tooltip => "Signs and other items you examined",
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,
3040);
3041
2505sub cf::client::send_msg { 3042sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 3043 my ($self, $channel, $msg, $color, @extra) = @_;
2507 3044
2508 $msg = $self->pl->expand_cfpod ($msg); 3045 $msg = $self->pl->expand_cfpod ($msg)
3046 unless $color & cf::NDI_VERBATIM;
2509 3047
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 3048 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 3049
3050 # check predefined channels, for the benefit of C
3051 if ($CHANNEL{$channel}) {
3052 $channel = $CHANNEL{$channel};
3053
3054 $self->ext_msg (channel_info => $channel);
3055 $channel = $channel->{id};
3056
2512 if (ref $channel) { 3057 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 3058 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 3059 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 3060 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 3061 $self->ext_msg (channel_info => $channel);
2517 } 3062 }
2519 $channel = $channel->{id}; 3064 $channel = $channel->{id};
2520 } 3065 }
2521 3066
2522 return unless @extra || length $msg; 3067 return unless @extra || length $msg;
2523 3068
2524 if ($self->can_msg) {
2525 # default colour, mask it out 3069 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3070 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF; 3071 if $color & cf::NDI_DEF;
2528 3072
2529 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3073 my $pkt = "msg "
3074 . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2531 } else { 3076 );
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542 3077
2543 $color &= cf::NDI_COLOR_MASK; 3078 $self->send_big_packet ($pkt);
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556} 3079}
2557 3080
2558=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2559 3082
2560Sends an ext event to the client. 3083Sends an ext event to the client.
2563 3086
2564sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2565 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2566 3089
2567 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2570 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 } 3095 }
2573} 3096}
2574 3097
2575=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2576 3099
2580 3103
2581sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2583 3106
2584 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove 3110 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 } 3113 }
2591} 3114}
2592 3115
2593=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2594 3117
2665 3188
2666 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
2667 if $reply; 3190 if $reply;
2668 3191
2669 } else { 3192 } else {
2670 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";
2671 } 3194 }
2672 3195
2673 cf::override; 3196 cf::override;
2674 }, 3197 },
2675); 3198);
2695 3218
2696 $coro 3219 $coro
2697} 3220}
2698 3221
2699cf::client->attach ( 3222cf::client->attach (
2700 on_destroy => sub { 3223 on_client_destroy => sub {
2701 my ($ns) = @_; 3224 my ($ns) = @_;
2702 3225
2703 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2704 }, 3227 },
2705); 3228);
2721our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
2722 3245
2723$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
2724 3247
2725$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
2727 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
2728 sort time 3251 sort time
2729)); 3252));
2730 3253
2731# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
2733=pod 3256=pod
2734 3257
2735The following functions and methods are available within a safe environment: 3258The following functions and methods are available within a safe environment:
2736 3259
2737 cf::object 3260 cf::object
2738 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
2739 insert remove name archname title slaying race decrease_ob_nr 3262 insert remove name archname title slaying race decrease split
3263 value
2740 3264
2741 cf::object::player 3265 cf::object::player
2742 player 3266 player
2743 3267
2744 cf::player 3268 cf::player
2749 3273
2750=cut 3274=cut
2751 3275
2752for ( 3276for (
2753 ["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
2754 insert remove inv name archname title slaying race 3278 insert remove inv nrof name archname title slaying race
2755 decrease_ob_nr)], 3279 decrease split destroy change_exp value msg lore send_msg)],
2756 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 3281 ["cf::player" => qw(peaceful send_msg)],
2758 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
2759) { 3283) {
2760 no strict 'refs';
2761 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
2762 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2763 for @funs; 3286 for @funs;
2764} 3287}
2765 3288
2780 3303
2781 my $qcode = $code; 3304 my $qcode = $code;
2782 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2783 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
2784 3307
3308 %vars = (_dummy => 0) unless %vars;
3309
3310 my @res;
2785 local $_; 3311 local $_;
2786 local @safe::cf::_safe_eval_args = values %vars;
2787 3312
2788 my $eval = 3313 my $eval =
2789 "do {\n" 3314 "do {\n"
2790 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2791 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
2792 . $code 3317 . $code
2793 . "\n}" 3318 . "\n}"
2794 ; 3319 ;
2795 3320
3321 if ($CFG{safe_eval}) {
2796 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
2797 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2798 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 }
2799 3330
2800 if ($@) { 3331 if ($@) {
2801 warn "$@"; 3332 warn "$@",
2802 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
2803 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
2804 } 3335 }
2805 3336
2806 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
2807} 3338}
2808 3339
2822=cut 3353=cut
2823 3354
2824sub register_script_function { 3355sub register_script_function {
2825 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
2826 3357
2827 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
2828 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
2829} 3360}
2830 3361
2831=back 3362=back
2832 3363
2833=cut 3364=cut
2842 # for this (global event?) 3373 # for this (global event?)
2843 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
2844 3375
2845 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2846 3377
2847 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
2848 3379
2849 my $facedata;
2850 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
2851 or die "$path: $!"; 3381 or die "$path: $!";
2852 3382
2853 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
2854 3384
2855 $facedata->{version} == 2 3385 $facedata->{version} == 2
2856 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
2857 3387
2858 # 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]);
2859 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
2860 type => FT_RSRC, 3391 type => FT_RSRC,
2861 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),
2862 }; 3394 };
2863 cf::cede_to_tick; 3395 cf::cede_to_tick;
2864 3396
2865 { 3397 {
2866 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
2867 3399
2868 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
2869 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402
2870 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2874 3407
2875 cf::cede_to_tick; 3408 cf::cede_to_tick;
2876 } 3409 }
2877 3410
2878 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
2879 next unless $info->{smooth}; 3412 next unless $info->{smooth};
3413
2880 my $idx = cf::face::find $face 3414 my $idx = cf::face::find $face
2881 or next; 3415 or next;
3416
2882 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2885 } else { 3420 } else {
2886 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
2887 } 3422 }
2888 3423
2889 cf::cede_to_tick; 3424 cf::cede_to_tick;
2890 } 3425 }
2891 } 3426 }
2900 3435
2901 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
2902 } 3437 }
2903 3438
2904 { 3439 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
2908 3441
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3443 if (defined $info->{type}) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914 3445
2915 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2916 # prepend meta info 3447 cf::face::set_type $idx, $info->{type};
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else { 3448 } else {
2925 $data = $info->{data}; 3449 $RESOURCE{$name} = $info; # unused
2926 } 3450 }
2927 3451
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick; 3452 cf::cede_to_tick;
2932 } 3453 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 } 3454 }
3455
3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2952 3457
2953 1 3458 1
2954} 3459}
2955 3460
2956register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
2958 3463
2959 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v); 3465 $ns->fx_want ($k, $v);
2961 } 3466 }
2962}; 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}
2963 3478
2964sub reload_regions { 3479sub reload_regions {
2965 # 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
2966 # for this (global event?) 3481 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = (); 3482 %ext::player_env::MUSIC_FACE_CACHE = ();
2981} 3496}
2982 3497
2983sub reload_archetypes { 3498sub reload_archetypes {
2984 load_resource_file "$DATADIR/archetypes" 3499 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n"; 3500 or die "unable to load archetypes\n";
2986 #d# NEED to laod twice to resolve forward references
2987 # this really needs to be done in an extra post-pass
2988 # (which needs to be synchronous, so solve it differently)
2989 load_resource_file "$DATADIR/archetypes"
2990 or die "unable to load archetypes\n";
2991} 3501}
2992 3502
2993sub reload_treasures { 3503sub reload_treasures {
2994 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
2995 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
2996} 3506}
2997 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
2998sub reload_resources { 3531sub reload_resources {
2999 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3000 3533
3534 reload_exp_table;
3535 reload_materials;
3536 reload_facedata;
3537 reload_sound;
3538 reload_archetypes;
3001 reload_regions; 3539 reload_regions;
3002 reload_facedata;
3003 #reload_archetypes;#d#
3004 reload_archetypes;
3005 reload_treasures; 3540 reload_treasures;
3006 3541
3007 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3008}
3009
3010sub init {
3011 reload_resources;
3012} 3543}
3013 3544
3014sub reload_config { 3545sub reload_config {
3015 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3016 or return;
3017 3547
3018 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...
3019 *CFG = YAML::Syck::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3020 3555
3021 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3022 3557
3023 $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};
3024 $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};
3025 3560
3026 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
3030 }; 3565 };
3031 warn $@ if $@; 3566 warn $@ if $@;
3032 } 3567 }
3033} 3568}
3034 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
3035sub 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
3036 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3037 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
3038 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#
3039 (async { 3611 (async {
3040 Event::one_event; 3612 $Coro::current->{desc} = "IDLE BUG HANDLER";
3613 EV::loop EV::LOOP_ONESHOT;
3041 })->prio (Coro::PRIO_MAX); 3614 })->prio (Coro::PRIO_MAX);
3042 }; 3615 };
3043 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;
3044 reload_config; 3629 reload_config;
3045 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
3046 load_extensions; 3640 load_extensions;
3047 3641
3048 $TICK_WATCHER->start; 3642 utime time, time, $RUNTIMEFILE;
3049 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;
3050} 3660}
3051 3661
3052############################################################################# 3662#############################################################################
3053# initialisation and cleanup 3663# initialisation and cleanup
3054 3664
3055# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3056BEGIN { 3666BEGIN {
3667 our %SIGWATCHER = ();
3057 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3058 Event->signal ( 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3059 reentrant => 0,
3060 data => WF_AUTOCANCEL,
3061 signal => $signal,
3062 prio => 0,
3063 cb => sub {
3064 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3065 },
3066 ); 3671 };
3067 } 3672 }
3068} 3673}
3069 3674
3070sub write_runtime { 3675sub write_runtime_sync {
3071 my $runtime = "$LOCALDIR/runtime"; 3676 my $t0 = AE::time;
3072 3677
3073 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3074 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3075 3680
3076 IO::AIO::aio_utime $runtime, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3077 3682
3078 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3079 3684
3080 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3081 or return; 3686 or return;
3082 3687
3083 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3084 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3085 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
3095 aio_utime $fh, undef, undef; 3700 aio_utime $fh, undef, undef;
3096 3701
3097 close $fh 3702 close $fh
3098 or return; 3703 or return;
3099 3704
3100 aio_rename "$runtime~", $runtime 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3101 and return; 3706 and return;
3102 3707
3103 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3104 3709
3105 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 };
3106} 3761}
3107 3762
3108sub emergency_save() { 3763sub emergency_save() {
3109 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3110 3765
3111 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;
3112 3772
3113 cf::sync_job { 3773 cf::sync_job {
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3114 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3115 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3116 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3117 warn "begin emergency player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3118 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3119 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3120 $pl->valid or next; 3782 $pl->valid or next;
3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3121 $pl->save; 3784 $pl->save;
3122 } 3785 }
3123 warn "end emergency player save\n"; 3786 info "emergency_perl_save: end player save\n";
3124 3787
3125 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";
3126 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3127 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3128 $map->valid or next; 3793 $map->valid or next;
3129 $map->save; 3794 $map->save;
3130 } 3795 }
3131 warn "end emergency map save\n"; 3796 info "emergency_perl_save: end map save\n";
3132 3797
3133 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";
3134 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3135 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
3136 }; 3826 };
3137 3827
3138 warn "leave emergency perl save\n"; 3828 info "emergency_perl_save: leave\n";
3139} 3829}
3140 3830
3141sub post_cleanup { 3831sub post_cleanup {
3142 my ($make_core) = @_; 3832 my ($make_core) = @_;
3143 3833
3834 IO::AIO::flush;
3835
3144 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3145 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 }
3146} 3866}
3147 3867
3148sub do_reload_perl() { 3868sub do_reload_perl() {
3149 # can/must only be called in main 3869 # can/must only be called in main
3150 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3151 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3152 return; 3872 return;
3153 } 3873 }
3154 3874
3875 return if $RELOAD++;
3876
3877 my $t1 = AE::time;
3878
3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3155 warn "reloading..."; 3881 info "reloading...";
3156 3882
3157 warn "entering sync_job"; 3883 trace "entering sync_job";
3158 3884
3159 cf::sync_job { 3885 cf::sync_job {
3160 cf::write_runtime; # external watchdog should not bark
3161 cf::emergency_save; 3886 #cf::emergency_save;
3162 cf::write_runtime; # external watchdog should not bark
3163 3887
3164 warn "syncing database to disk";
3165 BDB::db_env_txn_checkpoint $DB_ENV;
3166
3167 # if anything goes wrong in here, we should simply crash as we already saved
3168
3169 warn "cancelling all WF_AUTOCANCEL watchers";
3170 for (Event::all_watchers) {
3171 $_->cancel if $_->data & WF_AUTOCANCEL;
3172 }
3173
3174 warn "flushing outstanding aio requests";
3175 for (;;) {
3176 BDB::flush;
3177 IO::AIO::flush;
3178 Coro::cede;
3179 last unless IO::AIO::nreqs || BDB::nreqs;
3180 warn "iterate...";
3181 }
3182
3183 ++$RELOAD;
3184
3185 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3186 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3187 %EXT_CORO = (); 3890 %EXT_CORO = ();
3188 3891
3189 warn "removing commands"; 3892 trace "removing commands";
3190 %COMMAND = (); 3893 %COMMAND = ();
3191 3894
3192 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3193 %EXTCMD = (); 3896 %EXTCMD = ();
3194 %EXTICMD = (); 3897 %EXTICMD = ();
3195 3898
3196 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3197 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3198 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3199 3902
3200 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3201 eval { 3904 eval {
3202 $cb->($pkg); 3905 $cb->($pkg);
3203 1 3906 1
3204 } 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;
3205 } 3912 }
3206 3913
3207 warn "... nuking $pkg";
3208 Symbol::delete_package $pkg;
3209 }
3210
3211 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3212 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3213 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3214 3917
3215 warn "... unloading $k"; 3918 trace "... unloading $k";
3216 delete $INC{$k}; 3919 delete $INC{$k};
3217 3920
3218 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3219 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3220 3923
3221 if (my $cb = $k->can ("unload_module")) { 3924 if (my $cb = $k->can ("unload_module")) {
3222 $cb->(); 3925 $cb->();
3926 }
3927
3928 clear_package $k;
3223 } 3929 }
3224 3930
3225 Symbol::delete_package $k;
3226 }
3227
3228 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3229 Symbol::delete_package "safe::$_" 3932 clear_package "safe::$_"
3230 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);
3231 3934
3232 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3233 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3234 delete $INC{"cf/pod.pm"}; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3235 3938
3236 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3237 # and global variables created in xs 3940 # and global variables created in xs
3238 #Symbol::delete_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3239 3942
3240 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3241 3944
3242 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3243 require cf; 3946 require cf;
3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3245 3948
3246 warn "loading config and database again"; 3949 trace "loading config and database again";
3247 cf::reload_config; 3950 cf::reload_config;
3248 3951
3249 warn "loading extensions"; 3952 trace "loading extensions";
3250 cf::load_extensions; 3953 cf::load_extensions;
3251 3954
3955 if ($REATTACH_ON_RELOAD) {
3252 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3253 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3254 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3255 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3256 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3257 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3962 }
3258 3963
3964 trace "running post_init jobs";
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966
3259 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3260 3968
3261 1 3969 1
3262 } or do { 3970 } or do {
3263 warn $@; 3971 error $@;
3264 warn "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3265 exit 1; 3973 };
3974
3975 info "reloaded";
3976 --$RELOAD;
3266 }; 3977 }
3267 3978
3268 warn "reloaded"; 3979 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n";
3269}; 3981};
3270 3982
3271our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3272 3984
3273sub reload_perl() { 3985sub reload_perl() {
3274 # doing reload synchronously and two reloads happen back-to-back, 3986 # doing reload synchronously and two reloads happen back-to-back,
3275 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3276 3988
3277 $RELOAD_WATCHER ||= Event->timer ( 3989 $RELOAD_WATCHER ||= cf::async {
3278 reentrant => 0, 3990 Coro::AIO::aio_wait cache_extensions;
3279 after => 0, 3991
3280 data => WF_AUTOCANCEL, 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3281 cb => sub {
3282 do_reload_perl; 3993 do_reload_perl;
3283 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3284 }, 3995 };
3285 ); 3996 };
3286} 3997}
3287 3998
3288register_command "reload" => sub { 3999register_command "reload" => sub {
3289 my ($who, $arg) = @_; 4000 my ($who, $arg) = @_;
3290 4001
3291 if ($who->flag (FLAG_WIZ)) { 4002 if ($who->flag (FLAG_WIZ)) {
3292 $who->message ("reloading server."); 4003 $who->message ("reloading server.");
4004 async {
4005 $Coro::current->{desc} = "perl_reload";
3293 async { reload_perl }; 4006 reload_perl;
4007 };
3294 } 4008 }
3295}; 4009};
3296 4010
3297unshift @INC, $LIBDIR; 4011#############################################################################
3298 4012
3299my $bug_warning = 0; 4013my $bug_warning = 0;
3300 4014
3301our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3302our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3303 4017
3304sub wait_for_tick { 4018sub wait_for_tick() {
3305 return unless $TICK_WATCHER->is_active;
3306 return if $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3307 4020
3308 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3309 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3310 $signal->wait; 4023 $signal->wait;
3311} 4024}
3312 4025
3313sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3314 return unless $TICK_WATCHER->is_active;
3315 return if $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3316 4028
3317 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait; 4031 $signal->wait;
3320} 4032}
3321 4033
3322 my $min = 1e6;#d# 4034sub tick {
3323 my $avg = 10;
3324$TICK_WATCHER = Event->timer (
3325 reentrant => 0,
3326 parked => 1,
3327 prio => 0,
3328 at => $NEXT_TICK || $TICK,
3329 data => WF_AUTOCANCEL,
3330 cb => sub {
3331 if ($Coro::current != $Coro::main) { 4035 if ($Coro::current != $Coro::main) {
3332 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"
3333 unless ++$bug_warning > 10; 4037 unless ++$bug_warning > 10;
3334 return; 4038 return;
3335 } 4039 }
3336 4040
3337 $NOW = $tick_start = Event::time;
3338
3339 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3340 4042
3341 0 && sync_job {#d# 4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346 4044
3347 $map->width (50); 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3348 $map->height (50); 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3349 $map->alloc; 4047 Coro::async_pool {
3350 $map->_load_objects ("/tmp/x.map", 1); 4048 $Coro::current->{desc} = "runtime saver";
3351 my $t = Event::time - $t; 4049 write_runtime_sync
3352 4050 or error "ERROR: unable to write runtime file: $!";
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 }; 4051 };
4052 }
3363 4053
3364 $RUNTIME += $TICK;
3365 $NEXT_TICK += $TICK;
3366
3367 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3368 $NEXT_RUNTIME_WRITE = $NOW + 10;
3369 Coro::async_pool {
3370 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!";
3372 };
3373 }
3374
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send; 4055 $sig->send;
3380 } 4056 }
3381 while (my $sig = shift @WAIT_FOR_TICK) { 4057 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send; 4058 $sig->send;
3383 } 4059 }
3384 4060
3385 $NOW = Event::time; 4061 $LOAD = ($NOW - $TICK_START) / $TICK;
3386
3387 # if we are delayed by four ticks or more, skip them all
3388 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3389
3390 $TICK_WATCHER->at ($NEXT_TICK);
3391 $TICK_WATCHER->start;
3392
3393 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395 4063
3396 _post_tick; 4064 if (0) {
3397 4065 if ($NEXT_TICK) {
3398 4066 my $jitter = $TICK_START - $NEXT_TICK;
4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4068 debug "jitter $JITTER\n";#d#
4069 }
3399 }, 4070 }
3400); 4071}
3401 4072
3402{ 4073{
3403 BDB::max_poll_time $TICK * 0.1; 4074 # configure BDB
3404 $BDB_POLL_WATCHER = Event->io ( 4075
3405 reentrant => 0,
3406 fd => BDB::poll_fileno,
3407 poll => 'r',
3408 prio => 0,
3409 data => WF_AUTOCANCEL,
3410 cb => \&BDB::poll_cb,
3411 );
3412 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3413 4077 BDB::max_poll_reqs $TICK * 0.1;
3414 BDB::set_sync_prepare { 4078 $AnyEvent::BDB::WATCHER->priority (1);
3415 my $status;
3416 my $current = $Coro::current;
3417 (
3418 sub {
3419 $status = $!;
3420 $current->ready; undef $current;
3421 },
3422 sub {
3423 Coro::schedule while defined $current;
3424 $! = $status;
3425 },
3426 )
3427 };
3428 4079
3429 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3430 $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);
3431 4087
3432 cf::sync_job { 4088 cf::sync_job {
3433 eval { 4089 eval {
3434 BDB::db_env_open 4090 BDB::db_env_open
3435 $DB_ENV, 4091 $DB_ENV,
3437 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
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4094 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666; 4095 0666;
3440 4096
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4097 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 }; 4098 };
3446 4099
3447 cf::cleanup "db_env_open(db): $@" if $@; 4100 cf::cleanup "db_env_open(db): $@" if $@;
3448 }; 4101 };
3449 } 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 };
3450} 4113}
3451 4114
3452{ 4115{
4116 # configure IO::AIO
4117
3453 IO::AIO::min_parallel 8; 4118 IO::AIO::min_parallel 8;
3454
3455 undef $Coro::AIO::WATCHER;
3456 IO::AIO::max_poll_time $TICK * 0.1; 4119 IO::AIO::max_poll_time $TICK * 0.1;
3457 $AIO_POLL_WATCHER = Event->io ( 4120 undef $AnyEvent::AIO::WATCHER;
3458 reentrant => 0,
3459 data => WF_AUTOCANCEL,
3460 fd => IO::AIO::poll_fileno,
3461 poll => 'r',
3462 prio => 6,
3463 cb => \&IO::AIO::poll_cb,
3464 );
3465} 4121}
3466 4122
3467my $_log_backtrace; 4123my $_log_backtrace;
3468 4124
3469sub _log_backtrace { 4125sub _log_backtrace {
3472 $msg =~ s/\n//; 4128 $msg =~ s/\n//;
3473 4129
3474 # limit the # of concurrent backtraces 4130 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) { 4131 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace; 4132 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg;
3477 async { 4134 async {
4135 $Coro::current->{desc} = "abt $msg";
4136
3478 my @bt = fork_call { 4137 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr; 4138 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4139 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 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 |"
3482 or die "addr2line: $!"; 4141 or die "addr2line: $!";
3490 } 4149 }
3491 4150
3492 @funcs 4151 @funcs
3493 }; 4152 };
3494 4153
3495 LOG llevInfo, "[ABT] $msg\n"; 4154 LOG llevInfo, "[ABT] $perl_bt\n";
4155 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3496 LOG llevInfo, "[ABT] $_\n" for @bt; 4156 LOG llevInfo, "[ABT] $_\n" for @bt;
3497 --$_log_backtrace; 4157 --$_log_backtrace;
3498 }; 4158 };
3499 } else { 4159 } else {
3500 LOG llevInfo, "[ABT] $msg\n"; 4160 LOG llevInfo, "[ABT] $msg\n";
3501 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3502 } 4162 }
3503} 4163}
3504 4164
3505# load additional modules 4165# load additional modules
3506use cf::pod; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3507 4168
3508END { cf::emergency_save } 4169END { cf::emergency_save }
3509 4170
35101 41711
3511 4172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines