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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines