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.345 by root, Tue Aug 28 19:30:11 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines