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.357 by root, Tue Sep 4 08:42:58 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines