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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines