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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC

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

Diff Legend

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