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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.483 by root, Mon Oct 12 04:02:17 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your 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 GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5; 56use Digest::MD5;
31use Fcntl; 57use Fcntl;
32use YAML (); 58use YAML ();
33use IO::AIO 2.51 (); 59use IO::AIO ();
34use Time::HiRes; 60use Time::HiRes;
35use Compress::LZF; 61use Compress::LZF;
36use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
37 65
38# configure various modules to our taste 66# configure various modules to our taste
39# 67#
40$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 76
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 79
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 81
48our %COMMAND = (); 82our %COMMAND = ();
49our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
52our %EXTCMD = (); 86our %EXTCMD = ();
53our %EXTICMD = (); 87our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
56 90
57our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
59 95
60our $CONFDIR = confdir; 96our $CONFDIR = confdir;
61our $DATADIR = datadir; 97our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
71our %RESOURCE; 110our %RESOURCE;
72 111
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 114our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
79 116
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 120our $DB_ENV;
85 121
122our @EXTRA_MODULES = qw(pod match mapscript);
123
86our %CFG; 124our %CFG;
87 125
88our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 127our $RUNTIME;
90our $NOW; 128our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 134# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 136
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
102 146
103binmode STDOUT; 147binmode STDOUT;
104binmode STDERR; 148binmode STDERR;
105 149
106# read virtual server time, if available 150# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
111} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
112 158
113mkdir $_ 159mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 161
116our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
117 163
118sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 176
120############################################################################# 177#############################################################################
121 178
122=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
123 180
174 231
175This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 234that call.
178 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
179=back 242=back
180 243
181=cut 244=cut
182 245
183BEGIN { 246$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 247 my $msg = join "", @_;
186 248
187 $msg .= "\n" 249 $msg .= "\n"
188 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
189 251
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 253
192 LOG llevError, $msg; 254 LOG llevError, $msg;
193 }; 255};
194}
195 256
196$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "=="
259
197 warn Carp::longmess $_[0]; 260 warn Carp::longmess $_[0];
261
262 if ($Coro::current == $Coro::main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d#
265 }#d#
266
267 # kill coroutine otherwise
198 Coro::terminate; 268 Coro::terminate
199}; 269};
200 270
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 281for my $pkg (qw(
212 cf::global cf::attachable 282 cf::global cf::attachable
213 cf::object cf::object::player 283 cf::object cf::object::player
214 cf::client cf::player 284 cf::client cf::player
215 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
216 cf::map cf::party cf::region 287 cf::party cf::region
217)) { 288)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 290}
221 291
222$EV::DIED = sub { 292$EV::DIED = sub {
223 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266 336
267sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
269 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
270=item cf::lock_wait $string 354=item cf::lock_wait $string
271 355
272Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
273 357
274=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
275 359
276Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
277a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
278for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
279returned. 363returned.
280 364
281Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro. 366deadlocked coro.
288 372
289Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
290 374
291=cut 375=cut
292 376
293our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 378
296sub lock_wait($) { 379sub lock_wait($) {
297 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 381}
310 382
311sub lock_acquire($) { 383sub lock_acquire($) {
312 my ($key) = @_; 384 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 385}
326 386
327sub lock_active($) { 387sub lock_active($) {
328 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 389}
332 390
333sub freeze_mainloop { 391sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
335 393
336 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 395}
342 396
343=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
344 398
345Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
400 } 454 }
401 } 455 }
402}; 456};
403 457
404sub get_slot($;$$) { 458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
405 my ($time, $pri, $name) = @_; 461 my ($time, $pri, $name) = @_;
406 462
407 $time = $TICK * .6 if $time > $TICK * .6; 463 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 464 my $sig = new Coro::Signal;
409 465
446 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
448 504
449 LOG llevError, Carp::longmess "sync job";#d# 505 LOG llevError, Carp::longmess "sync job";#d#
450 506
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
454 508
455 my $busy = 1; 509 my $busy = 1;
456 my @res; 510 my @res;
457 511
468 } else { 522 } else {
469 EV::loop EV::LOOP_ONESHOT; 523 EV::loop EV::LOOP_ONESHOT;
470 } 524 }
471 } 525 }
472 526
473 $time = EV::time - $time; 527 my $time = EV::time - $time;
474 528
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 529 $TICK_START += $time; # do not account sync jobs to server load
479 530
480 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
481 } else { 532 } else {
482 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
483 534
525 reset_signals; 576 reset_signals;
526 &$cb 577 &$cb
527 }, @args; 578 }, @args;
528 579
529 wantarray ? @res : $res[-1] 580 wantarray ? @res : $res[-1]
581}
582
583=item $coin = coin_from_name $name
584
585=cut
586
587our %coin_alias = (
588 "silver" => "silvercoin",
589 "silvercoin" => "silvercoin",
590 "silvercoins" => "silvercoin",
591 "gold" => "goldcoin",
592 "goldcoin" => "goldcoin",
593 "goldcoins" => "goldcoin",
594 "platinum" => "platinacoin",
595 "platinumcoin" => "platinacoin",
596 "platinumcoins" => "platinacoin",
597 "platina" => "platinacoin",
598 "platinacoin" => "platinacoin",
599 "platinacoins" => "platinacoin",
600 "royalty" => "royalty",
601 "royalties" => "royalty",
602);
603
604sub coin_from_name($) {
605 $coin_alias{$_[0]}
606 ? cf::arch::find $coin_alias{$_[0]}
607 : undef
530} 608}
531 609
532=item $value = cf::db_get $family => $key 610=item $value = cf::db_get $family => $key
533 611
534Returns a single value from the environment database. 612Returns a single value from the environment database.
673 751
674############################################################################# 752#############################################################################
675 753
676=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
677 755
678Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
679attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
681 759
682In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
683C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
733=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
734 812
735Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
737 815
738Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
739that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
740 818
741These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
742 820
743=over 4 821=over 4
1034 1112
1035sub reattach { 1113sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1115 my ($obj) = @_;
1038 1116
1117 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1119
1041 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
1042 1121
1043 @$registry = (); 1122 @$registry = ();
1044 1123
1090 utf8::decode (my $decname = $filename); 1169 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1093 1172
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1098 close $fh; 1180 aio_close $fh;
1099 1181
1100 if (@$objs) { 1182 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1106 close $fh; 1191 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1193 }
1109 } else { 1194 } else {
1110 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1111 } 1196 }
1112 1197
1113 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1202 } else {
1115 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1116 } 1204 }
1117 } else { 1205 } else {
1118 aio_unlink $filename; 1206 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1120 } 1208 }
1211 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1212 1300
1213 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1214} 1302}
1215 1303
1304use File::Glob ();
1305
1216cf::player->attach ( 1306cf::player->attach (
1217 on_command => sub { 1307 on_command => sub {
1218 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1219 1309
1220 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
1252 1342
1253 cf::override; 1343 cf::override;
1254 }, 1344 },
1255); 1345);
1256 1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1359
1257sub load_extensions { 1360sub load_extensions {
1258 cf::sync_job { 1361 cf::sync_job {
1259 my %todo; 1362 my %todo;
1260 1363
1261 for my $path (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
1280 1383
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1386
1284 $ext{source} = 1387 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1287 . $source 1390 . $source
1288 . "\n};\n1"; 1391 . "\n};\n1";
1289 1392
1290 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
1306 my $msg = $@ ? "$v->{path}: $@\n" 1409 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1410 : "$v->{base}: extension inactive.\n";
1308 1411
1309 if (exists $v->{meta}{mandatory}) { 1412 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1413 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1414 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1415 }
1314 1416
1315 warn $msg; 1417 warn $msg;
1316 } 1418 }
1317 1419
1331 1433
1332=back 1434=back
1333 1435
1334=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1335 1437
1336Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1337 1439
1338=cut 1440=cut
1339 1441
1340package cf::player; 1442package cf::player;
1341 1443
1384 1486
1385sub exists($) { 1487sub exists($) {
1386 my ($login) = @_; 1488 my ($login) = @_;
1387 1489
1388 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1390} 1492}
1391 1493
1392sub find($) { 1494sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1496 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1508 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1509 or return;
1408 1510
1409 my $pl = cf::player::load_pl $f 1511 my $pl = cf::player::load_pl $f
1410 or return; 1512 or return;
1513
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1514 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1515 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1414 } 1517 }
1415 } 1518 }
1425 1528
1426 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1427 1530
1428 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1533
1534 cf::get_slot 0.01;
1430 1535
1431 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1537 cf::cede_to_tick;
1433} 1538}
1434 1539
1466 my ($pl) = @_; 1571 my ($pl) = @_;
1467 1572
1468 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1469 1574
1470 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1577
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1477 1584
1478 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1625
1519 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1520 my $path = path $login; 1627 my $path = path $login;
1521 1628
1522 # a .pst is a dead give-away for a valid player 1629 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1635 }
1528 1636
1559 } 1667 }
1560 1668
1561 \@paths 1669 \@paths
1562} 1670}
1563 1671
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1673
1566Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1675
1657=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1658 1677
1659Sends an ext reply to the player. 1678Sends an ext reply to the player.
1660 1679
1727our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1729 1748
1730sub generate_random_map { 1749sub generate_random_map {
1731 my ($self, $rmp) = @_; 1750 my ($self, $rmp) = @_;
1751
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753
1732 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1755 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1858 1880
1859# the temporary/swap location 1881# the temporary/swap location
1860sub save_path { 1882sub save_path {
1861 my ($self) = @_; 1883 my ($self) = @_;
1862 1884
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1865} 1887}
1866 1888
1867# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1868sub uniq_path { 1890sub uniq_path {
1869 my ($self) = @_; 1891 my ($self) = @_;
1870 1892
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 1895}
1883 1896
1884sub decay_objects { 1897sub decay_objects {
1885 my ($self) = @_; 1898 my ($self) = @_;
1886 1899
1970sub find { 1983sub find {
1971 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1972 1985
1973 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1974 1987
1975 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1977 1990
1978 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1983 or return; 1993 or return;
1984 1994
1985 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1986 1996
1988 or return; 1998 or return;
1989 1999
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
1993 undef $guard1; 2004 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2005 $map->reset;
1996 return find $path; 2006 return find $path;
1997 } 2007 }
1998 2008
1999 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2037 $f->skip_block;
2028 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2029 or return; 2039 or return;
2030 2040
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2032 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2033 2043
2034 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2045 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2065 $self->decay_objects;
2056 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2057 $self->update_buttons; 2067 $self->update_buttons;
2058 cf::cede_to_tick; 2068 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2069 $self->activate;
2062 } 2070 }
2063 2071
2064 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
2066 2074
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2076 }
2069 2077
2070 $self->post_load; 2078 $self->post_load;
2071} 2079}
2072 2080
2130 my ($path, $origin, $load) = @_; 2138 my ($path, $origin, $load) = @_;
2131 2139
2132 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
2133 2141
2134 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2144 }
2137 2145
2138 $MAP_PREFETCH{$path} |= $load; 2146 $MAP_PREFETCH{$path} |= $load;
2139 2147
2140 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2177 cf::async { 2185 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2186 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
2180 }; 2188 };
2181 2189
2190 cf::get_slot 0.02;
2191
2182 if ($uniq) { 2192 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2195 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2194 $self->save; 2204 $self->save;
2195 2205
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2207
2198 return if $self->players; 2208 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2201 2211
2202 $self->in_memory (cf::MAP_SWAPPED); 2212 $self->in_memory (cf::MAP_SWAPPED);
2203 2213
2204 $self->deactivate; 2214 $self->deactivate;
2229 2239
2230 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231 2241
2232 return if $self->players; 2242 return if $self->players;
2233 2243
2234 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2235 2245
2236 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2237 2247
2238 # need to save uniques path 2248 # need to save uniques path
2239 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
2322 2332
2323sub unique_maps() { 2333sub unique_maps() {
2324 [ 2334 [
2325 map { 2335 map {
2326 utf8::decode $_; 2336 utf8::decode $_;
2327 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2328 ? normalise $_ 2340 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2342 ]
2332} 2343}
2333 2344
2334package cf;
2335
2336=back 2345=back
2337 2346
2338=head3 cf::object 2347=head3 cf::object
2339 2348
2340=cut 2349=cut
2343 2352
2344=over 4 2353=over 4
2345 2354
2346=item $ob->inv_recursive 2355=item $ob->inv_recursive
2347 2356
2348Returns the inventory of the object _and_ their inventories, recursively. 2357Returns the inventory of the object I<and> their inventories, recursively,
2358but I<not> the object itself.
2349 2359
2350=cut 2360=cut
2351 2361
2352sub inv_recursive_; 2362sub inv_recursive_;
2353sub inv_recursive_ { 2363sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2359} 2369}
2360 2370
2361=item $ref = $ob->ref 2371=item $ref = $ob->ref
2362 2372
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2373Creates and returns a persistent reference to an object that can be stored as a string.
2364 2374
2365=item $ob = cf::object::deref ($refstring) 2375=item $ob = cf::object::deref ($refstring)
2366 2376
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2378even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2410can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2411dialogue with the given NPC character.
2402 2412
2403=cut 2413=cut
2404 2414
2415our $SAY_CHANNEL = {
2416 id => "say",
2417 title => "Map",
2418 reply => "say ",
2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2420};
2421
2422our $CHAT_CHANNEL = {
2423 id => "chat",
2424 title => "Chat",
2425 reply => "chat ",
2426 tooltip => "Player chat and shouts, global to the server.",
2427};
2428
2405# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2430# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2431#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2433 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2446
2423 } else { 2447 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2450 }
2427 } 2451 }
2428} 2452}
2429 2453
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2479
2456=item $player_object->enter_link 2480=item $player_object->enter_link
2457 2481
2458Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2459 2483
2460The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2462 2488
2463Will never block. 2489Will never block.
2464 2490
2465=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2466 2492
2524 2550
2525 $map->load; 2551 $map->load;
2526 $map->load_neighbours; 2552 $map->load_neighbours;
2527 2553
2528 return unless $self->contr->active; 2554 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2555
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2533} 2561}
2534 2562
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2564
2537Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2567that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2568the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2569be called at the end of this process.
2570
2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
2542 2573
2543=cut 2574=cut
2544 2575
2545our $GOTOGEN; 2576our $GOTOGEN;
2546 2577
2625} 2656}
2626 2657
2627sub prepare_random_map { 2658sub prepare_random_map {
2628 my ($exit) = @_; 2659 my ($exit) = @_;
2629 2660
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2663 # that depends on the exit object
2635 2664
2636 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2667 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2643 } 2674 }
2644 2675
2645 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2646 2677
2647 my $data = cf::encode_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2650 2681
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2684 undef $fh;
2654 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2655 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2658 } 2693 }
2659} 2694}
2660 2695
2661sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2663 2698
2664 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2665 2700
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2701 $self->enter_link;
2678 2702
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2703 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2704 $Coro::current->{desc} = "enter_exit";
2685 2705
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2706 unless (eval {
2707 $self->deactivate_recursive; # just to be sure
2708
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2718 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp;
2720
2688 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2689 2722
2723 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y)
2725 if $exit->flag (cf::FLAG_DAMNED);
2726
2690 1; 2727 1
2691 }) { 2728 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2733
2697 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
2763 id => "infobox", 2800 id => "infobox",
2764 title => "Body Parts", 2801 title => "Body Parts",
2765 reply => undef, 2802 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2767 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2768 "c/uptime" => { 2841 "c/uptime" => {
2769 id => "infobox", 2842 id => "infobox",
2770 title => "Uptime", 2843 title => "Uptime",
2771 reply => undef, 2844 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 2848 id => "infobox",
2776 title => "Map Info", 2849 title => "Map Info",
2777 reply => undef, 2850 reply => undef,
2778 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2779 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2780); 2867);
2781 2868
2782sub cf::client::send_msg { 2869sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2871
2785 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2786 2874
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 2876
2789 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2792 2880
2793 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2797 2883
2798 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 2889 }
2805 2890
2806 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2807 } 2892 }
2808 2893
2809 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2810 2895
2811 if ($self->can_msg) {
2812 # default colour, mask it out 2896 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2815 2899
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 2903 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 2904
2830 $color &= cf::NDI_COLOR_MASK; 2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2831 2908
2832 utf8::encode $msg; 2909 # split very large packets
2833 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2834 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2835 # COMMAND/INFO 2912 $pkt = "frag";
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 } 2913 }
2914
2915 $self->send_packet ($pkt);
2843} 2916}
2844 2917
2845=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2846 2919
2847Sends an ext event to the client. 2920Sends an ext event to the client.
3021 3094
3022The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3023 3096
3024 cf::object 3097 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3100 value
3027 3101
3028 cf::object::player 3102 cf::object::player
3029 player 3103 player
3030 3104
3031 cf::player 3105 cf::player
3036 3110
3037=cut 3111=cut
3038 3112
3039for ( 3113for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3046) { 3120) {
3047 no strict 'refs'; 3121 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3066 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3067 3141
3068 my $qcode = $code; 3142 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3071 3147
3072 local $_; 3148 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3074 3150
3075 my $eval = 3151 my $eval =
3255 while (my ($k, $v) = each %$want) { 3331 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3332 $ns->fx_want ($k, $v);
3257 } 3333 }
3258}; 3334};
3259 3335
3336sub load_resource_file($) {
3337 my $guard = lock_acquire "load_resource_file";
3338
3339 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100;
3341 cf::arch::commit_load;
3342
3343 $status
3344}
3345
3260sub reload_regions { 3346sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3347 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3348 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3350
3277} 3363}
3278 3364
3279sub reload_archetypes { 3365sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3368}
3288 3369
3289sub reload_treasures { 3370sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
3292} 3373}
3293 3374
3294sub reload_resources { 3375sub reload_resources {
3295 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
3296 3377
3378 reload_facedata;
3379 reload_archetypes;
3297 reload_regions; 3380 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3381 reload_treasures;
3302 3382
3303 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3384}
3309 3385
3310sub reload_config { 3386sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3388 or return;
3326 }; 3402 };
3327 warn $@ if $@; 3403 warn $@ if $@;
3328 } 3404 }
3329} 3405}
3330 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3331sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
3332 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3453 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3339 }; 3457 };
3340 3458
3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3341 reload_config; 3463 reload_config;
3342 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3343 load_extensions; 3477 load_extensions;
3344 3478
3345 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3480
3347 EV::loop; 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
3348} 3489}
3349 3490
3350############################################################################# 3491#############################################################################
3351# initialisation and cleanup 3492# initialisation and cleanup
3352 3493
3358 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
3359 }; 3500 };
3360 } 3501 }
3361} 3502}
3362 3503
3363sub write_runtime { 3504sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime";
3365
3366 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3368 3507
3369 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3509
3371 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3372 3511
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3374 or return; 3513 or return;
3375 3514
3376 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3389 3528
3390 close $fh 3529 close $fh
3391 or return; 3530 or return;
3392 3531
3393 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3533 and return;
3395 3534
3396 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3397 3536
3398 1 3537 1
3538}
3539
3540our $uuid_lock;
3541our $uuid_skip;
3542
3543sub write_uuid_sync($) {
3544 $uuid_skip ||= $_[0];
3545
3546 return if $uuid_lock;
3547 local $uuid_lock = 1;
3548
3549 my $uuid = "$LOCALDIR/uuid";
3550
3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3552 or return;
3553
3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0;
3563
3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3565 and return;
3566
3567 # always fsync - this file is important
3568 aio_fsync $fh
3569 and return;
3570
3571 close $fh
3572 or return;
3573
3574 aio_rename "$uuid~", $uuid
3575 and return;
3576
3577 warn "uuid file written ($value).\n";
3578
3579 1
3580
3581}
3582
3583sub write_uuid($$) {
3584 my ($skip, $sync) = @_;
3585
3586 $sync ? write_uuid_sync $skip
3587 : async { write_uuid_sync $skip };
3399} 3588}
3400 3589
3401sub emergency_save() { 3590sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3403 3592
3404 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3405 3594
3406 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3407 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3607 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3609 $pl->save;
3416 } 3610 }
3417 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3418 3612
3419 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3616 $map->valid or next;
3423 $map->save; 3617 $map->save;
3424 } 3618 }
3425 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3426 3620
3427 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3624
3625 warn "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n";
3430 }; 3628 };
3431 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3432 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3433} 3636}
3434 3637
3435sub post_cleanup { 3638sub post_cleanup {
3436 my ($make_core) = @_; 3639 my ($make_core) = @_;
3437 3640
3438 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
3440} 3672}
3441 3673
3442sub do_reload_perl() { 3674sub do_reload_perl() {
3443 # can/must only be called in main 3675 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3445 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3446 return; 3678 return;
3447 } 3679 }
3448 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3449 warn "reloading..."; 3686 warn "reloading...";
3450 3687
3451 warn "entering sync_job"; 3688 warn "entering sync_job";
3452 3689
3453 cf::sync_job { 3690 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3692 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3457 3694
3458 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3697
3461 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
3462 3699
3463 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = ();
3477
3478 warn "removing commands";
3479 %COMMAND = ();
3480
3481 warn "removing ext/exti commands";
3482 %EXTCMD = ();
3483 %EXTICMD = ();
3484
3485 warn "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg";
3488
3489 if (my $cb = $pkg->can ("unload")) {
3490 eval {
3491 $cb->($pkg);
3492 1
3493 } or warn "$pkg unloaded, but with errors: $@";
3494 } 3703 }
3495 3704
3496 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3498 } 3707 %EXT_CORO = ();
3499 3708
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3719
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3511 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3512 } 3729 }
3513 3730
3514 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
3515 } 3746 }
3516 3747
3517 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3751
3521 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3755
3525 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3757 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3528 3759
3529 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3530 3761
3531 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3532 require cf; 3763 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl_1;
3534 3765
3535 warn "loading config and database again"; 3766 warn "loading config and database again";
3536 cf::reload_config; 3767 cf::reload_config;
3537 3768
3538 warn "loading extensions"; 3769 warn "loading extensions";
3539 cf::load_extensions; 3770 cf::load_extensions;
3540 3771
3772 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3547 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3548 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3549 3785
3550 1 3786 1
3551 } or do { 3787 } or do {
3552 warn $@; 3788 warn $@;
3553 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3790 };
3556 3791
3557 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3558}; 3798};
3559 3799
3560our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3561 3801
3562sub reload_perl() { 3802sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3565 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3567 do_reload_perl; 3810 do_reload_perl;
3568 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3569 }; 3813 };
3570} 3814}
3571 3815
3572register_command "reload" => sub { 3816register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3587 3831
3588our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3590 3834
3591sub wait_for_tick { 3835sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3837
3595 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3840 $signal->wait;
3598} 3841}
3599 3842
3600sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3845
3604 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3848 $signal->wait;
3607} 3849}
3608 3850
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3851sub tick {
3610 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
3613 return; 3855 return;
3614 } 3856 }
3615 3857
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3859
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3862 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3863 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3864 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3865 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3866 };
3630 } 3867 }
3631 3868
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3634 } 3871 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3873 $sig->send;
3637 } 3874 }
3638 3875
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3878
3642 _post_tick; 3879 if (0) {
3643}; 3880 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3881 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d#
3884 }
3885 }
3886}
3645 3887
3646{ 3888{
3647 # configure BDB 3889 # configure BDB
3648 3890
3649 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3650 BDB::max_poll_reqs $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3893 $AnyEvent::BDB::WATCHER->priority (1);
3652 3894
3653 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3902
3660 cf::sync_job { 3903 cf::sync_job {
3661 eval { 3904 eval {
3687{ 3930{
3688 # configure IO::AIO 3931 # configure IO::AIO
3689 3932
3690 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 3935 undef $AnyEvent::AIO::WATCHER;
3693} 3936}
3694 3937
3695my $_log_backtrace; 3938my $_log_backtrace;
3696 3939
3697sub _log_backtrace { 3940sub _log_backtrace {
3700 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3701 3944
3702 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3705 async { 3949 async {
3706 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3707 3951
3708 my @bt = fork_call { 3952 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3720 } 3964 }
3721 3965
3722 @funcs 3966 @funcs
3723 }; 3967 };
3724 3968
3725 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 3972 --$_log_backtrace;
3728 }; 3973 };
3729 } else { 3974 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 3977 }
3733} 3978}
3734 3979
3735# load additional modules 3980# load additional modules
3736use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3982cf::_connect_to_perl_2;
3737 3983
3738END { cf::emergency_save } 3984END { cf::emergency_save }
3739 3985
37401 39861
3741 3987

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines