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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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
596
597sub post_fork {
598 reset_signals;
599}
480 600
481sub fork_call(&@) { 601sub fork_call(&@) {
482 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
483 603
484 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
487 607
488 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
489 reset_signals; 609 cf::post_fork;
490 &$cb 610 &$cb
491 }, @args; 611 }, @args;
492 612
493 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
494} 614}
495 615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
496=item $value = cf::db_get $family => $key 654=item $value = cf::db_get $family => $key
497 655
498Returns a single value from the environment database. 656Returns a single value from the environment database.
499 657
500=item cf::db_put $family => $key => $value 658=item cf::db_put $family => $key => $value
501 659
502Stores the given C<$value> in the family. It can currently store binary 660Stores 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). 661data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 662
663=item $db = cf::db_table "name"
664
665Create and/or open a new database table. The string must not be "db" and must be unique
666within each server.
667
505=cut 668=cut
669
670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
674 my ($name) = @_;
675 my $db = BDB::db_create $DB_ENV;
676
677 eval {
678 $db->set_flags (BDB::CHKSUM);
679
680 utf8::encode $name;
681 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
682 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
683 cf::cleanup "db_open(db): $!" if $!;
684 };
685 cf::cleanup "db_open(db): $@" if $@;
686
687 $db
688}
506 689
507our $DB; 690our $DB;
508 691
509sub db_init { 692sub db_init {
510 unless ($DB) { 693 $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} 694}
525 695
526sub db_get($$) { 696sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
528 698
529 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
530 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
531 703
532 $! ? () 704 $! ? ()
533 : $data 705 : $data
534 }
535} 706}
536 707
537sub db_put($$$) { 708sub db_put($$$) {
538 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
595 766
596 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data); 768 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
599 770
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
601 772
602 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
605 776
615 786
616=cut 787=cut
617 788
618sub datalog($@) { 789sub datalog($@) {
619 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
621} 792}
622 793
623=back 794=back
624 795
625=cut 796=cut
626 797
627############################################################################# 798#############################################################################
628 799
629=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
630 801
631Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
632attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
634 805
635In the following description, CLASS can be any of C<global>, C<object> 806In 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 807C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 808Deliantra).
638 809
639=over 4 810=over 4
640 811
641=item $attachable->attach ($attachment, key => $value...) 812=item $attachable->attach ($attachment, key => $value...)
642 813
686=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
687 858
688Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
690 861
691Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
692that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
693 864
694These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
695 866
696=over 4 867=over 4
820 991
821 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
822 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
823 994
824 } elsif (ref $type) { 995 } elsif (ref $type) {
825 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
826 997
827 } else { 998 } else {
828 shift @arg; 999 shift @arg;
829 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
830 } 1001 }
831 } 1002 }
832} 1003}
833 1004
834sub _object_attach { 1005sub _object_attach {
844 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
845 } 1016 }
846 1017
847 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
848 } else { 1019 } else {
849 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
850 } 1021 }
851 1022
852 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
853} 1024}
854 1025
913 1084
914 for (@$callbacks) { 1085 for (@$callbacks) {
915 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
916 1087
917 if ($@) { 1088 if ($@) {
918 warn "$@";
919 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
920 override; 1090 override;
921 } 1091 }
922 1092
923 return 1 if $override; 1093 return 1 if $override;
924 } 1094 }
925 1095
926 0 1096 0
927} 1097}
928 1098
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1099=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1100
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1101=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1102
933Generate an object-specific event with the given arguments. 1103Generate an object-specific event with the given arguments.
934 1104
940 1110
941=cut 1111=cut
942 1112
943############################################################################# 1113#############################################################################
944# object support 1114# object support
945#
946 1115
1116sub _object_equal($$);
1117sub _object_equal($$) {
1118 my ($a, $b) = @_;
1119
1120 return 0 unless (ref $a) eq (ref $b);
1121
1122 if ("HASH" eq ref $a) {
1123 my @ka = keys %$a;
1124 my @kb = keys %$b;
1125
1126 return 0 if @ka != @kb;
1127
1128 for (0 .. $#ka) {
1129 return 0 unless $ka[$_] eq $kb[$_];
1130 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1131 }
1132
1133 } elsif ("ARRAY" eq ref $a) {
1134
1135 return 0 if @$a != @$b;
1136
1137 for (0 .. $#$a) {
1138 return 0 unless _object_equal $a->[$_], $b->[$_];
1139 }
1140
1141 } elsif ($a ne $b) {
1142 return 0;
1143 }
1144
1145 1
1146}
1147
1148our $SLOW_MERGES;#d#
947sub _can_merge { 1149sub _can_merge {
948 my ($ob1, $ob2) = @_; 1150 my ($ob1, $ob2) = @_;
949 1151
950 local $Storable::canonical = 1; 1152 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1153
954 $fob1 eq $fob2 1154 # we do the slow way here
1155 return _object_equal $ob1, $ob2
955} 1156}
956 1157
957sub reattach { 1158sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1160 my ($obj) = @_;
960 1161
1162 # no longer needed after getting rid of delete_package?
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962 1164
963 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
964 1166
965 @$registry = (); 1167 @$registry = ();
966 1168
971 for (@$attach) { 1173 for (@$attach) {
972 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
973 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
974 } 1176 }
975 } else { 1177 } else {
976 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
977 } 1179 }
978 } 1180 }
979} 1181}
980 1182
981cf::attachable->attach ( 1183cf::attachable->attach (
982 prio => -1000000, 1184 prio => -1000000,
983 on_instantiate => sub { 1185 on_instantiate => sub {
984 my ($obj, $data) = @_; 1186 my ($obj, $data) = @_;
985 1187
986 $data = from_json $data; 1188 $data = decode_json $data;
987 1189
988 for (@$data) { 1190 for (@$data) {
989 my ($name, $args) = @$_; 1191 my ($name, $args) = @$_;
990 1192
991 $obj->attach ($name, %{$args || {} }); 1193 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1209sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1009 1211
1010 sync_job { 1212 sync_job {
1011 if (length $$rdata) { 1213 if (length $$rdata) {
1214 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1014 1218
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1019 close $fh; 1226 aio_close $fh;
1020 1227
1021 if (@$objs) { 1228 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1027 close $fh; 1237 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1239 }
1030 } else { 1240 } else {
1031 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1032 } 1242 }
1033 1243
1034 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1248 } else {
1036 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1037 } 1250 }
1038 } else { 1251 } else {
1039 aio_unlink $filename; 1252 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1041 } 1254 }
1042 } 1255 };
1043} 1256}
1044 1257
1045sub object_freezer_as_string { 1258sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1259 my ($rdata, $objs) = @_;
1047 1260
1059 or return; 1272 or return;
1060 1273
1061 unless (aio_stat "$filename.pst") { 1274 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1275 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1276 or return;
1277
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1278 my $st = eval { Coro::Storable::thaw $av };
1279 $av = $st->{objs};
1065 } 1280 }
1066 1281
1282 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1286
1069 return ($data, $av); 1287 ($data, $av)
1070} 1288}
1071 1289
1072=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1073 1291
1074=over 4 1292=over 4
1128 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1129 1347
1130 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1131} 1349}
1132 1350
1351use File::Glob ();
1352
1133cf::player->attach ( 1353cf::player->attach (
1134 on_command => sub { 1354 on_unknown_command => sub {
1135 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1136 1356
1137 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1138 or return; 1358 or return;
1139 1359
1162 1382
1163 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1164 if $reply; 1384 if $reply;
1165 1385
1166 } else { 1386 } else {
1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1168 } 1388 }
1169 1389
1170 cf::override; 1390 cf::override;
1171 }, 1391 },
1172); 1392);
1173 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1174sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1175 cf::sync_job { 1410 cf::sync_job {
1176 my %todo; 1411 my %todo;
1177 1412
1178 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1179 next unless -r $path; 1414 next unless -r $path;
1197 1432
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1435
1201 $ext{source} = 1436 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1203 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1204 . $source 1439 . $source
1205 . "\n};\n1"; 1440 . "\n};\n1";
1206 1441
1207 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1208 } 1443 }
1209 1444
1445 my $pass = 0;
1210 my %done; 1446 my %done;
1211 while (%todo) { 1447 while (%todo) {
1212 my $progress; 1448 my $progress;
1213 1449
1450 ++$pass;
1451
1452 ext:
1214 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip 1455 next ext
1217 unless exists $done{$_}; 1456 unless exists $done{$_};
1218 } 1457 }
1219 1458
1220 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1221 1460
1222 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1223 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1224 : "$v->{base}: extension inactive.\n";
1225 1465
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1226 if (exists $v->{meta}{mandatory}) { 1467 if exists $v->{meta}{mandatory};
1227 warn $msg; 1468
1228 warn "mandatory extension failed to load, exiting.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1229 exit 1; 1470 delete $todo{$k};
1230 } 1471 } else {
1231 1472 $done{$k} = delete $todo{$k};
1232 warn $msg; 1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1233 } 1478 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
1238 } 1479 }
1239 1480
1240 skip: 1481 unless ($progress) {
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1242 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1243 } 1489 }
1244 }; 1490 };
1245} 1491}
1246 1492
1247############################################################################# 1493#############################################################################
1248 1494
1249=back 1495=back
1250 1496
1251=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1252 1498
1253Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1254 1500
1255=cut 1501=cut
1256 1502
1257package cf::player; 1503package cf::player;
1258 1504
1259use Coro::AIO; 1505use Coro::AIO;
1260 1506
1261=head3 cf::player 1507=head3 cf::player
1262 1508
1263=over 4 1509=over 4
1510
1511=item cf::player::num_playing
1512
1513Returns the official number of playing players, as per the Crossfire metaserver rules.
1514
1515=cut
1516
1517sub num_playing {
1518 scalar grep
1519 $_->ob->map
1520 && !$_->hidden
1521 && !$_->ob->flag (cf::FLAG_WIZ),
1522 cf::player::list
1523}
1264 1524
1265=item cf::player::find $login 1525=item cf::player::find $login
1266 1526
1267Returns the given player object, loading it if necessary (might block). 1527Returns the given player object, loading it if necessary (might block).
1268 1528
1287 1547
1288sub exists($) { 1548sub exists($) {
1289 my ($login) = @_; 1549 my ($login) = @_;
1290 1550
1291 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1293} 1553}
1294 1554
1295sub find($) { 1555sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1557 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1564 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1565 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1566 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1567 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1568
1309 my $pl = load_pl path $login 1569 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1570 or return;
1571
1572 my $pl = cf::player::load_pl $f
1573 or return;
1574
1575 local $cf::PLAYER_LOADING{$login} = $pl;
1576 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1312 } 1578 }
1313 } 1579 }
1314} 1580}
1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1315 1594
1316sub save($) { 1595sub save($) {
1317 my ($pl) = @_; 1596 my ($pl) = @_;
1318 1597
1319 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1323 1602
1324 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1325 1604
1326 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1328 1612
1329 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1614 cf::cede_to_tick;
1331} 1615}
1332 1616
1364 my ($pl) = @_; 1648 my ($pl) = @_;
1365 1649
1366 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1367 1651
1368 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1654
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1375 1663
1376 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1701 or return [];
1414 1702
1415 my @logins; 1703 my @logins;
1416 1704
1417 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1706 my $path = path $login;
1707
1708 # a .pst is a dead give-away for a valid player
1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1714 }
1421 1715
1422 utf8::decode $login; 1716 utf8::decode $login;
1423 push @logins, $login; 1717 push @logins, $login;
1424 } 1718 }
1425 1719
1426 \@logins 1720 \@logins
1427} 1721}
1428 1722
1429=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1430 1726
1431Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1432player. May block. 1728player. May block.
1433 1729
1434=cut 1730=cut
1452 } 1748 }
1453 1749
1454 \@paths 1750 \@paths
1455} 1751}
1456 1752
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1754
1459Expand crossfire pod fragments into protocol xml. 1755Expand 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/(?<![BIUGHT])</&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 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507 1756
1508=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1509 1758
1510Sends an ext reply to the player. 1759Sends an ext reply to the player.
1511 1760
1543 1792
1544=cut 1793=cut
1545 1794
1546sub find_by_path($) { 1795sub find_by_path($) {
1547 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1548 1799
1549 my ($match, $specificity); 1800 my ($match, $specificity);
1550 1801
1551 for my $region (list) { 1802 for my $region (list) {
1552 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1578our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1579our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1580 1831
1581sub generate_random_map { 1832sub generate_random_map {
1582 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1583 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1584 $self->_create_random_map ( 1838 $self->_create_random_map (
1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1588 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1589 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1590 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1591 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1606 1860
1607sub register { 1861sub register {
1608 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1609 my $pkg = caller; 1863 my $pkg = caller;
1610 1864
1611 no strict;
1612 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1613 1866
1614 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1615} 1868}
1616 1869
1617# also paths starting with '/' 1870# also paths starting with '/'
1618$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1619 1872
1620sub thawer_merge { 1873sub thawer_merge {
1621 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1622 1875
1623 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1628} 1881}
1629 1882
1630sub normalise { 1883sub normalise {
1631 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1632 1885
1633 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1634 1887
1635 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1636 1889
1637 # map plan: 1890 # map plan:
1638 # 1891 #
1677 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1678 return $self; 1931 return $self;
1679 } 1932 }
1680 } 1933 }
1681 1934
1682 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1683 () 1936 ()
1684} 1937}
1685 1938
1686sub init { 1939sub init {
1687 my ($self) = @_; 1940 my ($self) = @_;
1709 1962
1710# the temporary/swap location 1963# the temporary/swap location
1711sub save_path { 1964sub save_path {
1712 my ($self) = @_; 1965 my ($self) = @_;
1713 1966
1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1715 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1716} 1969}
1717 1970
1718# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1719sub uniq_path { 1972sub uniq_path {
1720 my ($self) = @_; 1973 my ($self) = @_;
1721 1974
1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1723 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1724}
1725
1726# and all this just because we cannot iterate over
1727# all maps in C++...
1728sub change_all_map_light {
1729 my ($change) = @_;
1730
1731 $_->change_map_light ($change)
1732 for grep $_->outdoor, values %cf::MAP;
1733} 1977}
1734 1978
1735sub decay_objects { 1979sub decay_objects {
1736 my ($self) = @_; 1980 my ($self) = @_;
1737 1981
1750 1994
1751sub load_header_from($) { 1995sub load_header_from($) {
1752 my ($self, $path) = @_; 1996 my ($self, $path) = @_;
1753 1997
1754 utf8::encode $path; 1998 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1999 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 2000 or return;
2001
2002 $self->_load_header ($f)
2003 or return;
2004
2005 local $MAP_LOADING{$self->{path}} = $self;
2006 $f->resolve_delayed_derefs;
1760 2007
1761 $self->{load_path} = $path; 2008 $self->{load_path} = $path;
1762 2009
1763 1 2010 1
1764} 2011}
1816 2063
1817sub find; 2064sub find;
1818sub find { 2065sub find {
1819 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1820 2067
2068 cf::cede_to_tick;
2069
1821 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1822 2071
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1824 2074
1825 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path";
1827 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1828 or return; 2077 or return;
1829 2078
1830 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1831 2080
1833 or return; 2082 or return;
1834 2083
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
2088 undef $guard1;
1838 $map->reset; 2089 $map->reset;
1839 undef $guard;
1840 return find $path; 2090 return find $path;
1841 } 2091 }
1842 2092
1843 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1844 } 2094 }
1845} 2095}
1846 2096
1847sub pre_load { } 2097sub pre_load { }
1848sub post_load { } 2098#sub post_load { } # XS
1849 2099
1850sub load { 2100sub load {
1851 my ($self) = @_; 2101 my ($self) = @_;
1852 2102
1853 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
1854 2104
1855 my $path = $self->{path}; 2105 my $path = $self->{path};
1856 2106
1857 { 2107 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2108 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2109
2110 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2111 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2112
1863 $self->in_memory (cf::MAP_LOADING); 2113 $self->in_memory (cf::MAP_LOADING);
1864 2114
1865 $self->alloc; 2115 $self->alloc;
1866 2116
1867 $self->pre_load; 2117 $self->pre_load;
1868 cf::cede_to_tick; 2118 cf::cede_to_tick;
1869 2119
2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2122 $self->_load_objects ($f)
1871 or return; 2123 or return;
1872 2124
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
1874 if delete $self->{load_original}; 2126 if delete $self->{load_original};
1875 2127
1876 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2129 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2130 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2132 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2133 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs;
2135 }
1881 } 2136 }
1882 } 2137 }
2138
2139 $f->resolve_delayed_derefs;
1883 2140
1884 cf::cede_to_tick; 2141 cf::cede_to_tick;
1885 # now do the right thing for maps 2142 # now do the right thing for maps
1886 $self->link_multipart_objects; 2143 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2144 $self->difficulty ($self->estimate_difficulty)
1891 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
1892 $self->decay_objects; 2149 $self->decay_objects;
1893 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
1894 $self->update_buttons; 2151 $self->update_buttons;
1895 cf::cede_to_tick; 2152 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1898 $self->activate; 2153 $self->activate;
1899 } 2154 }
1900 2155
1901 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
1903 2158
1904 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
1905 } 2160 }
1906 2161
1907 $self->post_load; 2162 $self->post_load;
1908} 2163}
1909 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
1910sub customise_for { 2168sub customise_for {
1911 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
1912 2170
1913 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
1914 if $self->per_player; 2172 if $self->per_player;
1930 or next; 2188 or next;
1931 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
1932 or next; 2190 or next;
1933 $neigh->load; 2191 $neigh->load;
1934 2192
2193 # now find the diagonal neighbours
1935 push @neigh, 2194 push @neigh,
1936 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1937 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1938 } 2197 }
1939 2198
1946} 2205}
1947 2206
1948sub find_sync { 2207sub find_sync {
1949 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
1950 2209
1951 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
1952} 2214}
1953 2215
1954sub do_load_sync { 2216sub do_load_sync {
1955 my ($map) = @_; 2217 my ($map) = @_;
1956 2218
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
1959 2221
1960 cf::sync_job { $map->load }; 2222 $map->load;
1961} 2223}
1962 2224
1963our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
1965 2227
1967 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
1968 2230
1969 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
1970 2232
1971 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2235 }
1974 2236
1975 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
1976 2238
1977 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2240 $Coro::current->{desc} = "map prefetcher";
2241
1978 while (%MAP_PREFETCH) { 2242 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2243 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2244 if (my $map = find $k) {
1981 $map->load if $v; 2245 $map->load if $v;
1982 } 2246 }
1989 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
1990 2254
1991 () 2255 ()
1992} 2256}
1993 2257
2258# common code, used by both ->save and ->swapout
1994sub save { 2259sub _save {
1995 my ($self) = @_; 2260 my ($self) = @_;
1996
1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1998 2261
1999 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2000 2263
2001 return unless $self->dirty; 2264 return unless $self->dirty;
2002 2265
2008 return if $self->{deny_save}; 2271 return if $self->{deny_save};
2009 2272
2010 local $self->{last_access} = $self->last_access;#d# 2273 local $self->{last_access} = $self->last_access;#d#
2011 2274
2012 cf::async { 2275 cf::async {
2276 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2014 }; 2278 };
2279
2280 cf::get_slot 0.02;
2015 2281
2016 if ($uniq) { 2282 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2018 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2019 } else { 2285 } else {
2020 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2021 } 2287 }
2022} 2288}
2023 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2024sub swap_out { 2298sub swap_out {
2025 my ($self) = @_; 2299 my ($self) = @_;
2026 2300
2027 # save first because save cedes
2028 $self->save;
2029
2030 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2031 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2032 return if $self->players; 2305 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save};
2035 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2036 $self->clear; 2316 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2317}
2039 2318
2040sub reset_at { 2319sub reset_at {
2041 my ($self) = @_; 2320 my ($self) = @_;
2042 2321
2060 2339
2061 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2062 2341
2063 return if $self->players; 2342 return if $self->players;
2064 2343
2065 warn "resetting map ", $self->path; 2344 cf::trace "resetting map ", $self->path, "\n";
2066 2345
2067 $self->in_memory (cf::MAP_SWAPPED); 2346 $self->in_memory (cf::MAP_SWAPPED);
2068 2347
2069 # need to save uniques path 2348 # need to save uniques path
2070 unless ($self->{deny_save}) { 2349 unless ($self->{deny_save}) {
2074 if $uniq; 2353 if $uniq;
2075 } 2354 }
2076 2355
2077 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2078 2357
2358 $self->deactivate;
2359 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2360 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2361
2083 $self->unlink_save; 2362 $self->unlink_save;
2084 $self->destroy; 2363 $self->destroy;
2085} 2364}
2086 2365
2094 2373
2095 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2096 2375
2097 $self->unlink_save; 2376 $self->unlink_save;
2098 2377
2099 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2100 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2101 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2102 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2104 2383
2153 2432
2154sub unique_maps() { 2433sub unique_maps() {
2155 [ 2434 [
2156 map { 2435 map {
2157 utf8::decode $_; 2436 utf8::decode $_;
2158 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2159 ? normalise $_ 2440 : normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2162 ] 2442 ]
2163} 2443}
2164 2444
2165package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2166 2476
2167=back 2477=back
2168 2478
2169=head3 cf::object 2479=head3 cf::object
2170 2480
2174 2484
2175=over 4 2485=over 4
2176 2486
2177=item $ob->inv_recursive 2487=item $ob->inv_recursive
2178 2488
2179Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
2180 2491
2181=cut 2492=cut
2182 2493
2183sub inv_recursive_; 2494sub inv_recursive_;
2184sub inv_recursive_ { 2495sub inv_recursive_ {
2187 2498
2188sub inv_recursive { 2499sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2190} 2501}
2191 2502
2503=item $ref = $ob->ref
2504
2505Creates and returns a persistent reference to an object that can be stored as a string.
2506
2507=item $ob = cf::object::deref ($refstring)
2508
2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2510even if the object actually exists. May block.
2511
2512=cut
2513
2514sub deref {
2515 my ($ref) = @_;
2516
2517 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2518 my ($uuid, $name) = ($1, $2);
2519 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2520 or return;
2521 $pl->ob->uuid eq $uuid
2522 or return;
2523
2524 $pl->ob
2525 } else {
2526 warn "$ref: cannot resolve object reference\n";
2527 undef
2528 }
2529}
2530
2192package cf; 2531package cf;
2193 2532
2194=back 2533=back
2195 2534
2196=head3 cf::object::player 2535=head3 cf::object::player
2202Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2541Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2203can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2204dialogue with the given NPC character. 2543dialogue with the given NPC character.
2205 2544
2206=cut 2545=cut
2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2207 2560
2208# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2209# with dialog boxes. 2562# with dialog boxes.
2210#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2211sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2223 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225 2578
2226 } else { 2579 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2582 }
2230 } 2583 }
2231} 2584}
2232 2585
2233=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
2258 2611
2259=item $player_object->enter_link 2612=item $player_object->enter_link
2260 2613
2261Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2262 2615
2263The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2264I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2265 2620
2266Will never block. 2621Will never block.
2267 2622
2268=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2269 2624
2289sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2290 my ($self) = @_; 2645 my ($self) = @_;
2291 2646
2292 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2293 2648
2649 ++$self->{_link_recursion};
2650
2294 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2295 2652
2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2297 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2298 2655
2299 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2300} 2657}
2301 2658
2302sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2303 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2304 2661
2321 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2322 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2323 2680
2324 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2325 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2326 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2327 2684
2328 $map->load; 2685 $map->load;
2329 $map->load_neighbours; 2686 $map->load_neighbours;
2330 2687
2331 return unless $self->contr->active; 2688 return unless $self->contr->active;
2332 $self->activate_recursive;
2333 2689
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2335 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2336} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2337 2697
2698}
2699
2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2339 2701
2340Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2341her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2342that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2343the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2344be called at the end of this process. 2706be called at the end of this process.
2345 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2346=cut 2711=cut
2347 2712
2348our $GOTOGEN; 2713our $GOTOGEN;
2349 2714
2350sub cf::object::player::goto { 2715sub cf::object::player::goto {
2351 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2352 2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2723
2353 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2726
2356 $self->enter_link; 2727 $self->enter_link;
2357 2728
2358 (async { 2729 (async {
2730 $Coro::current->{desc} = "player::goto $path $x $y";
2731
2732 # *tag paths override both path and x|y
2733 if ($path =~ /^\*(.*)$/) {
2734 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2735 my $ob = $obs[rand @obs];
2736
2737 # see if we actually can go there
2738 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2739 $ob = $obs[rand @obs];
2740 } else {
2741 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2742 }
2743 # else put us there anyways for now #d#
2744
2745 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2746 } else {
2747 ($path, $x, $y) = (undef, undef, undef);
2748 }
2749 }
2750
2359 my $map = eval { 2751 my $map = eval {
2360 my $map = cf::map::find $path; 2752 my $map = defined $path ? cf::map::find $path : undef;
2361 2753
2362 if ($map) { 2754 if ($map) {
2363 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2365 } else { 2757 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2759 }
2368 2760
2369 $map 2761 $map
2370 }; 2762 };
2371 2763
2377 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2379 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2380 } 2772 }
2381 2773
2382 $done->() if $done; 2774 $done->($self) if $done;
2383 })->prio (1); 2775 })->prio (1);
2384} 2776}
2385 2777
2386=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2387 2779
2407} 2799}
2408 2800
2409sub prepare_random_map { 2801sub prepare_random_map {
2410 my ($exit) = @_; 2802 my ($exit) = @_;
2411 2803
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
2413
2414 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2415 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2416 # that depends on the exit object 2806 # that depends on the exit object
2417 2807
2418 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2420 if ($exit->map) { 2810 if ($exit->map) {
2421 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2422 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2423 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2424 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2425 } 2817 }
2426 2818
2427 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2428 2820
2429 my $data = cf::to_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2430 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2432 2824
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh; 2827 undef $fh;
2436 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2437 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2438 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2439 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2440 } 2836 }
2441} 2837}
2442 2838
2443sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2444 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2445 2841
2446 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2447 2843
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
2459 $self->enter_link; 2844 $self->enter_link;
2460 2845
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2465 (async { 2846 (async {
2466 $self->deactivate_recursive; # just to be sure 2847 $Coro::current->{desc} = "enter_exit";
2848
2467 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2468 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2469 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2470 1; 2870 1
2471 }) { 2871 }) {
2472 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2473 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2474 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2475 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2476 2876
2477 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2478 $self->leave_link; 2878 $self->leave_link;
2479 } 2879 }
2480 })->prio (1); 2880 })->prio (1);
2481} 2881}
2482 2882
2494sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2495 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2496 2896
2497 utf8::encode $text; 2897 utf8::encode $text;
2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2499} 2924}
2500 2925
2501=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2502 2927
2503Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2930the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2931the message unless the client supports the msg packet.
2507 2932
2508=cut 2933=cut
2509 2934
2935# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2511 "c/identify" => { 2943 "c/identify" => {
2512 id => "identify", 2944 id => "infobox",
2513 title => "Identify", 2945 title => "Identify",
2514 reply => undef, 2946 reply => undef,
2515 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2516 }, 2948 },
2517 "c/examine" => { 2949 "c/examine" => {
2518 id => "examine", 2950 id => "infobox",
2519 title => "Examine", 2951 title => "Examine",
2520 reply => undef, 2952 reply => undef,
2521 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2522 }, 2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2960 },
2961 "c/book" => {
2962 id => "infobox",
2963 title => "Book",
2964 reply => undef,
2965 tooltip => "The contents of a note or book",
2966 },
2967 "c/lookat" => {
2968 id => "infobox",
2969 title => "Look",
2970 reply => undef,
2971 tooltip => "What you saw there",
2972 },
2973 "c/who" => {
2974 id => "infobox",
2975 title => "Players",
2976 reply => undef,
2977 tooltip => "Shows players who are currently online",
2978 },
2979 "c/body" => {
2980 id => "infobox",
2981 title => "Body Parts",
2982 reply => undef,
2983 tooltip => "Shows which body parts you posess and are available",
2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
3021 "c/uptime" => {
3022 id => "infobox",
3023 title => "Uptime",
3024 reply => undef,
3025 tooltip => "How long the server has been running since last restart",
3026 },
3027 "c/mapinfo" => {
3028 id => "infobox",
3029 title => "Map Info",
3030 reply => undef,
3031 tooltip => "Information related to the maps",
3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2523); 3047);
2524 3048
2525sub cf::client::send_msg { 3049sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2527 3051
2528 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2529 3054
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 3056
2532 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3058 if ($CHANNEL{$channel}) {
3059 $channel = $CHANNEL{$channel};
2534 3060
3061 $self->ext_msg (channel_info => $channel);
3062 $channel = $channel->{id};
3063
2535 if (ref $channel) { 3064 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2540 if $self->can_msg;
2541 } 3069 }
2542 3070
2543 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2544 } 3072 }
2545 3073
2546 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2547 3075
2548 if ($self->can_msg) {
2549 # default colour, mask it out 3076 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2552 3079
2553 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2555 } else { 3083 );
2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566 3084
2567 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2568
2569 utf8::encode $msg;
2570
2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2574 } else {
2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2576 $self->send_packet ("drawinfo $color $msg")
2577 }
2578 }
2579 }
2580} 3086}
2581 3087
2582=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2583 3089
2584Sends an ext event to the client. 3090Sends an ext event to the client.
2587 3093
2588sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2589 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2590 3096
2591 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2594 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 } 3102 }
2597} 3103}
2598 3104
2599=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2600 3106
2604 3110
2605sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2607 3113
2608 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove 3117 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 } 3120 }
2615} 3121}
2616 3122
2617=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2618 3124
2689 3195
2690 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2691 if $reply; 3197 if $reply;
2692 3198
2693 } else { 3199 } else {
2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2695 } 3201 }
2696 3202
2697 cf::override; 3203 cf::override;
2698 }, 3204 },
2699); 3205);
2719 3225
2720 $coro 3226 $coro
2721} 3227}
2722 3228
2723cf::client->attach ( 3229cf::client->attach (
2724 on_destroy => sub { 3230 on_client_destroy => sub {
2725 my ($ns) = @_; 3231 my ($ns) = @_;
2726 3232
2727 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2728 }, 3234 },
2729); 3235);
2745our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
2746 3252
2747$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
2748 3254
2749$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
2751 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
2752 sort time 3258 sort time
2753)); 3259));
2754 3260
2755# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
2757=pod 3263=pod
2758 3264
2759The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
2760 3266
2761 cf::object 3267 cf::object
2762 contr pay_amount pay_player map x y force_find force_add 3268 contr pay_amount pay_player map x y force_find force_add destroy
2763 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
2764 3271
2765 cf::object::player 3272 cf::object::player
2766 player 3273 player
2767 3274
2768 cf::player 3275 cf::player
2773 3280
2774=cut 3281=cut
2775 3282
2776for ( 3283for (
2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
2779 decrease_ob_nr)], 3286 decrease split destroy change_exp value msg lore send_msg)],
2780 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
2781 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
2782 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
2783) { 3290) {
2784 no strict 'refs';
2785 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
2786 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2787 for @funs; 3293 for @funs;
2788} 3294}
2789 3295
2804 3310
2805 my $qcode = $code; 3311 my $qcode = $code;
2806 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2807 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
2808 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
2809 local $_; 3318 local $_;
2810 local @safe::cf::_safe_eval_args = values %vars;
2811 3319
2812 my $eval = 3320 my $eval =
2813 "do {\n" 3321 "do {\n"
2814 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2815 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
2816 . $code 3324 . $code
2817 . "\n}" 3325 . "\n}"
2818 ; 3326 ;
2819 3327
3328 if ($CFG{safe_eval}) {
2820 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
2821 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2822 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
2823 3337
2824 if ($@) { 3338 if ($@) {
2825 warn "$@"; 3339 warn "$@",
2826 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
2827 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
2828 } 3342 }
2829 3343
2830 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
2831} 3345}
2832 3346
2846=cut 3360=cut
2847 3361
2848sub register_script_function { 3362sub register_script_function {
2849 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
2850 3364
2851 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
2852 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
2853} 3367}
2854 3368
2855=back 3369=back
2856 3370
2857=cut 3371=cut
2866 # for this (global event?) 3380 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
2868 3382
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870 3384
2871 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
2872 3386
2873 my $facedata;
2874 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
2875 or die "$path: $!"; 3388 or die "$path: $!";
2876 3389
2877 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
2878 3391
2879 $facedata->{version} == 2 3392 $facedata->{version} == 2
2880 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
2881 3394
2882 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2883 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC, 3398 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
2886 }; 3401 };
2887 cf::cede_to_tick; 3402 cf::cede_to_tick;
2888 3403
2889 { 3404 {
2890 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
2891 3406
2892 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2893 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409
2894 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2898 3414
2899 cf::cede_to_tick; 3415 cf::cede_to_tick;
2900 } 3416 }
2901 3417
2902 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
2903 next unless $info->{smooth}; 3419 next unless $info->{smooth};
3420
2904 my $idx = cf::face::find $face 3421 my $idx = cf::face::find $face
2905 or next; 3422 or next;
3423
2906 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2909 } else { 3427 } else {
2910 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
2911 } 3429 }
2912 3430
2913 cf::cede_to_tick; 3431 cf::cede_to_tick;
2914 } 3432 }
2915 } 3433 }
2924 3442
2925 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
2926 } 3444 }
2927 3445
2928 { 3446 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
2932 3448
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938 3452
2939 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2940 # prepend meta info 3454 cf::face::set_type $idx, $info->{type};
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else { 3455 } else {
2949 $data = $info->{data}; 3456 $RESOURCE{$name} = $info; # unused
2950 } 3457 }
2951 3458
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick; 3459 cf::cede_to_tick;
2956 } 3460 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 } 3461 }
3462
3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2976 3464
2977 1 3465 1
2978} 3466}
2979 3467
2980register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
2982 3470
2983 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
2985 } 3473 }
2986}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
2987 3485
2988sub reload_regions { 3486sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?) 3488 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
3005} 3503}
3006 3504
3007sub reload_archetypes { 3505sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015} 3508}
3016 3509
3017sub reload_treasures { 3510sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3020} 3513}
3021 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3022sub reload_resources { 3538sub reload_resources {
3023 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3024 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3025 reload_regions; 3546 reload_regions;
3026 reload_facedata;
3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures; 3547 reload_treasures;
3030 3548
3031 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3032}
3033
3034sub init {
3035 reload_resources;
3036} 3550}
3037 3551
3038sub reload_config { 3552sub reload_config {
3039 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3040 or return;
3041 3554
3042 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3043 *CFG = YAML::Syck::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3044 3562
3045 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3046 3564
3047 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3048 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3049 3567
3050 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3054 }; 3572 };
3055 warn $@ if $@; 3573 warn $@ if $@;
3056 } 3574 }
3057} 3575}
3058 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3059sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3060 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3061 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3062 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3063 (async { 3618 (async {
3064 Event::one_event; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3620 EV::loop EV::LOOP_ONESHOT;
3065 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3066 }; 3622 };
3067 3623
3624 evthread_start IO::AIO::poll_fileno;
3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3068 reload_config; 3636 reload_config;
3069 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3070 load_extensions; 3647 load_extensions;
3071 3648
3072 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
3073 Event::loop; 3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3074} 3667}
3075 3668
3076############################################################################# 3669#############################################################################
3077# initialisation and cleanup 3670# initialisation and cleanup
3078 3671
3079# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3080BEGIN { 3673BEGIN {
3674 our %SIGWATCHER = ();
3081 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3082 Event->signal ( 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3083 reentrant => 0,
3084 data => WF_AUTOCANCEL,
3085 signal => $signal,
3086 prio => 0,
3087 cb => sub {
3088 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3089 },
3090 ); 3678 };
3091 } 3679 }
3092} 3680}
3093 3681
3094sub write_runtime { 3682sub write_runtime_sync {
3095 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3096 3684
3097 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3099 3687
3100 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3101 3689
3102 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3103 3691
3104 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3105 or return; 3693 or return;
3106 3694
3107 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3108 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3109 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3119 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3120 3708
3121 close $fh 3709 close $fh
3122 or return; 3710 or return;
3123 3711
3124 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3125 and return; 3713 and return;
3126 3714
3127 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3128 3716
3129 1 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
3130} 3768}
3131 3769
3132sub emergency_save() { 3770sub emergency_save() {
3133 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3134 3772
3135 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3136 3779
3137 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3138 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3139 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3140 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3141 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3142 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3143 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3144 $pl->valid or next; 3789 $pl->valid or next;
3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3145 $pl->save; 3791 $pl->save;
3146 } 3792 }
3147 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3148 3794
3149 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3150 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3151 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3152 $map->valid or next; 3800 $map->valid or next;
3153 $map->save; 3801 $map->save;
3154 } 3802 }
3155 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3156 3804
3157 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3158 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3159 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3160 }; 3833 };
3161 3834
3162 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3163} 3836}
3164 3837
3165sub post_cleanup { 3838sub post_cleanup {
3166 my ($make_core) = @_; 3839 my ($make_core) = @_;
3167 3840
3841 IO::AIO::flush;
3842
3168 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3169 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3170} 3873}
3171 3874
3172sub do_reload_perl() { 3875sub do_reload_perl() {
3173 # can/must only be called in main 3876 # can/must only be called in main
3174 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3175 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3176 return; 3879 return;
3177 } 3880 }
3178 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3179 warn "reloading..."; 3888 info "reloading...";
3180 3889
3181 warn "entering sync_job"; 3890 trace "entering sync_job";
3182 3891
3183 cf::sync_job { 3892 cf::sync_job {
3184 cf::write_runtime; # external watchdog should not bark
3185 cf::emergency_save; 3893 #cf::emergency_save;
3186 cf::write_runtime; # external watchdog should not bark
3187 3894
3188 warn "syncing database to disk";
3189 BDB::db_env_txn_checkpoint $DB_ENV;
3190
3191 # if anything goes wrong in here, we should simply crash as we already saved
3192
3193 warn "cancelling all WF_AUTOCANCEL watchers";
3194 for (Event::all_watchers) {
3195 $_->cancel if $_->data & WF_AUTOCANCEL;
3196 }
3197
3198 warn "flushing outstanding aio requests";
3199 for (;;) {
3200 BDB::flush;
3201 IO::AIO::flush;
3202 Coro::cede;
3203 last unless IO::AIO::nreqs || BDB::nreqs;
3204 warn "iterate...";
3205 }
3206
3207 ++$RELOAD;
3208
3209 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3210 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3211 %EXT_CORO = (); 3897 %EXT_CORO = ();
3212 3898
3213 warn "removing commands"; 3899 trace "removing commands";
3214 %COMMAND = (); 3900 %COMMAND = ();
3215 3901
3216 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3217 %EXTCMD = (); 3903 %EXTCMD = ();
3218 %EXTICMD = (); 3904 %EXTICMD = ();
3219 3905
3220 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3221 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3222 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3223 3909
3224 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3225 eval { 3911 eval {
3226 $cb->($pkg); 3912 $cb->($pkg);
3227 1 3913 1
3228 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3229 } 3919 }
3230 3920
3231 warn "... nuking $pkg";
3232 Symbol::delete_package $pkg;
3233 }
3234
3235 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3236 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3237 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3238 3924
3239 warn "... unloading $k"; 3925 trace "... unloading $k";
3240 delete $INC{$k}; 3926 delete $INC{$k};
3241 3927
3242 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3243 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3244 3930
3245 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3246 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3247 } 3936 }
3248 3937
3249 Symbol::delete_package $k;
3250 }
3251
3252 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3253 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3254 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3255 3941
3256 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3257 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3258 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3259 3945
3260 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3261 # and global variables created in xs 3947 # and global variables created in xs
3262 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3263 3949
3264 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3265 3951
3266 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3267 require cf; 3953 require cf;
3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3269 3955
3270 warn "loading config and database again"; 3956 trace "loading config and database again";
3271 cf::reload_config; 3957 cf::reload_config;
3272 3958
3273 warn "loading extensions"; 3959 trace "loading extensions";
3274 cf::load_extensions; 3960 cf::load_extensions;
3275 3961
3962 if ($REATTACH_ON_RELOAD) {
3276 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3277 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3278 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3279 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3280 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3281 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3282 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3283 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3284 3975
3285 1 3976 1
3286 } or do { 3977 } or do {
3287 warn $@; 3978 error $@;
3288 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3289 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3290 }; 3984 }
3291 3985
3292 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3293}; 3988};
3294 3989
3295our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3296 3991
3297sub reload_perl() { 3992sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3300 3995
3301 $RELOAD_WATCHER ||= Event->timer ( 3996 $RELOAD_WATCHER ||= cf::async {
3302 reentrant => 0, 3997 Coro::AIO::aio_wait cache_extensions;
3303 after => 0, 3998
3304 data => WF_AUTOCANCEL, 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3305 cb => sub {
3306 do_reload_perl; 4000 do_reload_perl;
3307 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3308 }, 4002 };
3309 ); 4003 };
3310} 4004}
3311 4005
3312register_command "reload" => sub { 4006register_command "reload" => sub {
3313 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3314 4008
3315 if ($who->flag (FLAG_WIZ)) { 4009 if ($who->flag (FLAG_WIZ)) {
3316 $who->message ("reloading server."); 4010 $who->message ("reloading server.");
4011 async {
4012 $Coro::current->{desc} = "perl_reload";
3317 async { reload_perl }; 4013 reload_perl;
4014 };
3318 } 4015 }
3319}; 4016};
3320 4017
3321unshift @INC, $LIBDIR; 4018#############################################################################
3322 4019
3323my $bug_warning = 0; 4020my $bug_warning = 0;
3324 4021
3325our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3327 4024
3328sub wait_for_tick { 4025sub wait_for_tick() {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3331 4027
3332 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait; 4030 $signal->wait;
3335} 4031}
3336 4032
3337sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3340 4035
3341 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait; 4038 $signal->wait;
3344} 4039}
3345 4040
3346 my $min = 1e6;#d# 4041sub tick {
3347 my $avg = 10;
3348$TICK_WATCHER = Event->timer (
3349 reentrant => 0,
3350 parked => 1,
3351 prio => 0,
3352 at => $NEXT_TICK || $TICK,
3353 data => WF_AUTOCANCEL,
3354 cb => sub {
3355 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3357 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
3358 return; 4045 return;
3359 } 4046 }
3360 4047
3361 $NOW = $tick_start = Event::time;
3362
3363 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3364 4049
3365 0 && sync_job {#d# 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370 4051
3371 $map->width (50); 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $map->height (50); 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3373 $map->alloc; 4054 Coro::async_pool {
3374 $map->_load_objects ("/tmp/x.map", 1); 4055 $Coro::current->{desc} = "runtime saver";
3375 my $t = Event::time - $t; 4056 write_runtime_sync
3376 4057 or error "ERROR: unable to write runtime file: $!";
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 }; 4058 };
4059 }
3387 4060
3388 $RUNTIME += $TICK;
3389 $NEXT_TICK += $TICK;
3390
3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
3393 Coro::async_pool {
3394 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!";
3396 };
3397 }
3398
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send; 4062 $sig->send;
3404 } 4063 }
3405 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send; 4065 $sig->send;
3407 } 4066 }
3408 4067
3409 $NOW = Event::time; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
3410
3411 # if we are delayed by four ticks or more, skip them all
3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3413
3414 $TICK_WATCHER->at ($NEXT_TICK);
3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419 4070
3420 _post_tick; 4071 if (0) {
3421 4072 if ($NEXT_TICK) {
3422 4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
3423 }, 4077 }
3424); 4078}
3425 4079
3426{ 4080{
3427 BDB::max_poll_time $TICK * 0.1; 4081 # configure BDB
3428 $BDB_POLL_WATCHER = Event->io ( 4082
3429 reentrant => 0,
3430 fd => BDB::poll_fileno,
3431 poll => 'r',
3432 prio => 0,
3433 data => WF_AUTOCANCEL,
3434 cb => \&BDB::poll_cb,
3435 );
3436 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3437 4084 BDB::max_poll_reqs $TICK * 0.1;
3438 BDB::set_sync_prepare { 4085 $AnyEvent::BDB::WATCHER->priority (1);
3439 my $status;
3440 my $current = $Coro::current;
3441 (
3442 sub {
3443 $status = $!;
3444 $current->ready; undef $current;
3445 },
3446 sub {
3447 Coro::schedule while defined $current;
3448 $! = $status;
3449 },
3450 )
3451 };
3452 4086
3453 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3454 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3455 4094
3456 cf::sync_job { 4095 cf::sync_job {
3457 eval { 4096 eval {
3458 BDB::db_env_open 4097 BDB::db_env_open
3459 $DB_ENV, 4098 $DB_ENV,
3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4100 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4101 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666; 4102 0666;
3464 4103
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4104 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 }; 4105 };
3470 4106
3471 cf::cleanup "db_env_open(db): $@" if $@; 4107 cf::cleanup "db_env_open(db): $@" if $@;
3472 }; 4108 };
3473 } 4109 }
4110
4111 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4112 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4113 };
4114 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4115 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116 };
4117 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119 };
3474} 4120}
3475 4121
3476{ 4122{
4123 # configure IO::AIO
4124
3477 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3478
3479 undef $Coro::AIO::WATCHER;
3480 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3481 $AIO_POLL_WATCHER = Event->io ( 4127 undef $AnyEvent::AIO::WATCHER;
3482 reentrant => 0,
3483 data => WF_AUTOCANCEL,
3484 fd => IO::AIO::poll_fileno,
3485 poll => 'r',
3486 prio => 6,
3487 cb => \&IO::AIO::poll_cb,
3488 );
3489} 4128}
3490 4129
3491my $_log_backtrace; 4130my $_log_backtrace;
3492 4131
3493sub _log_backtrace { 4132sub _log_backtrace {
3496 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3497 4136
3498 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3501 async { 4141 async {
4142 $Coro::current->{desc} = "abt $msg";
4143
3502 my @bt = fork_call { 4144 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4146 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4147 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!"; 4148 or die "addr2line: $!";
3514 } 4156 }
3515 4157
3516 @funcs 4158 @funcs
3517 }; 4159 };
3518 4160
3519 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3520 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3521 --$_log_backtrace; 4164 --$_log_backtrace;
3522 }; 4165 };
3523 } else { 4166 } else {
3524 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3526 } 4169 }
3527} 4170}
3528 4171
3529# load additional modules 4172# load additional modules
3530use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3531 4175
3532END { cf::emergency_save } 4176END { cf::emergency_save }
3533 4177
35341 41781
3535 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines