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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines