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.360 by root, Sun Sep 9 06:25:46 2007 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines