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

Diff Legend

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