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.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.125 by root, Tue Jan 2 23:06:39 2007 UTC

… …
181sub to_json($) { 181sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 183 JSON::Syck::Dump $_[0]
184} 184}
185 185
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string
209
210Wait until the given lock is available. See cf::lock_acquire.
211
212=item my $lock = cf::lock_acquire $string
213
214Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically
217returned.
218
219Lock names should begin with a unique identifier (for example, find_map
220uses map_find and load_map uses map_load).
221
222=cut
223
224our %LOCK;
225
226sub lock_wait($) {
227 my ($key) = @_;
228
229 # wait for lock, if any
230 while ($LOCK{$key}) {
231 push @{ $LOCK{$key} }, $Coro::current;
232 Coro::schedule;
233 }
234}
235
236sub lock_acquire($) {
237 my ($key) = @_;
238
239 # wait, to be sure we are not locked
240 lock_wait $key;
241
242 $LOCK{$key} = [];
243
244 cf::guard {
245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} };
247 }
248}
249
186=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
187 251
188The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 253always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 254reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 261=cut
198 262
199sub sync_job(&) { 263sub sync_job(&) {
200 my ($job) = @_; 264 my ($job) = @_;
201 265
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 266 if ($Coro::current == $Coro::main) {
267 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/
269
212 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
271 # (but this is cancel-safe)
213 local $FREEZE = 1; 272 local $FREEZE = 1;
273
274 my $busy = 1;
275 my @res;
276
277 (Coro::async {
278 @res = eval { $job->() };
279 warn $@ if $@;
280 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 281 })->prio (Coro::PRIO_MAX);
282
215 while ($busy) { 283 while ($busy) {
216 Coro::cede_notself; 284 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 285 Event::one_event unless Coro::nready;
218 } 286 }
287
288 wantarray ? @res : $res[0]
219 } else { 289 } else {
220 $coro->join; 290 # we are in another coroutine, how wonderful, everything just works
291
292 $job->()
221 } 293 }
222
223 wantarray ? @res : $res[0]
224} 294}
225 295
226=item $coro = cf::coro { BLOCK } 296=item $coro = cf::coro { BLOCK }
227 297
228Creates and returns a new coro. This coro is automcatially being canceled 298Creates and returns a new coro. This coro is automcatially being canceled
… …
252 my $runtime = cf::localdir . "/runtime"; 322 my $runtime = cf::localdir . "/runtime";
253 323
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 324 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 325 or return;
256 326
257 my $value = $cf::RUNTIME; 327 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 328 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 329 and return;
260 330
261 aio_fsync $fh 331 aio_fsync $fh
262 and return; 332 and return;
… …
283 353
284 $path = $path->as_string if ref $path; 354 $path = $path->as_string if ref $path;
285 355
286 my $self = bless { }, $class; 356 my $self = bless { }, $class;
287 357
358 # {... are special paths that are not touched
359 # ?xxx/... are special absolute paths
360 # ?random/... random maps
361 # /! non-realised random map exit
362 # /... normal maps
363 # ~/... per-player maps without a specific player (DO NOT USE)
364 # ~user/... per-player map of a specific user
365
366 if ($path =~ /^{/) {
367 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 368 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 369 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 370 $self->{random} = cf::from_json $data;
291 } else { 371 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 372 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 373 $self->{user_rel} = 1;
… …
798 or return; 878 or return;
799 879
800 unless (aio_stat "$filename.pst") { 880 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 881 (aio_load "$filename.pst", $av) >= 0
802 or return; 882 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 883 $av = eval { (Storable::thaw $av)->{objs} };
804 } 884 }
805 885
886 warn sprintf "loading %s (%d)\n",
887 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 888 return ($data, $av);
807} 889}
808 890
809############################################################################# 891#############################################################################
810# command handling &c 892# command handling &c
… …
1046use Fcntl; 1128use Fcntl;
1047use Coro::AIO; 1129use Coro::AIO;
1048 1130
1049our $MAX_RESET = 7200; 1131our $MAX_RESET = 7200;
1050our $DEFAULT_RESET = 3600; 1132our $DEFAULT_RESET = 3600;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1133
1054sub generate_random_map { 1134sub generate_random_map {
1055 my ($path, $rmp) = @_; 1135 my ($path, $rmp) = @_;
1056 1136
1057 # mit "rum" bekleckern, nicht 1137 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1153# and all this just because we cannot iterate over
1074# all maps in C++... 1154# all maps in C++...
1075sub change_all_map_light { 1155sub change_all_map_light {
1076 my ($change) = @_; 1156 my ($change) = @_;
1077 1157
1078 $_->change_map_light ($change) for values %cf::MAP; 1158 $_->change_map_light ($change)
1159 for grep $_->outdoor, values %cf::MAP;
1079} 1160}
1080 1161
1081sub try_load_header($) { 1162sub try_load_header($) {
1082 my ($path) = @_; 1163 my ($path) = @_;
1083 1164
… …
1090 1171
1091 $map->load_header ($path) 1172 $map->load_header ($path)
1092 or return; 1173 or return;
1093 1174
1094 $map->{load_path} = $path; 1175 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1176
1097 $map 1177 $map
1098} 1178}
1099 1179
1100sub find_map { 1180sub find_map {
1101 my ($path, $origin) = @_; 1181 my ($path, $origin) = @_;
1102 1182
1103 #warn "find_map<$path,$origin>\n";#d# 1183 #warn "find_map<$path,$origin>\n";#d#
1104 1184
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1185 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1186 my $key = $path->as_string;
1107 1187
1188 cf::lock_wait "map_find:$key";
1189
1108 $cf::MAP{$key} || do { 1190 $cf::MAP{$key} || do {
1191 my $guard = cf::lock_acquire "map_find:$key";
1192
1109 # do it the slow way 1193 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1194 my $map = try_load_header $path->save_path;
1111 1195
1112 if ($map) { 1196 if ($map) {
1113 # safety 1197 # safety
… …
1120 $map = try_load_header $path->load_path; 1204 $map = try_load_header $path->load_path;
1121 } 1205 }
1122 1206
1123 $map or return; 1207 $map or return;
1124 1208
1209 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1210 $map->{instantiate_time} = $cf::RUNTIME;
1126 $map->instantiate; 1211 $map->instantiate;
1127 1212
1128 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1130 } 1215 }
1131 1216
1132 $map->path ($key); 1217 $map->path ($key);
1133 $map->{path} = $path; 1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME;
1134 $map->last_access ($cf::RUNTIME); 1220 $map->last_access ($cf::RUNTIME);
1135 1221
1136 $map->reset if $map->should_reset; 1222 if ($map->should_reset) {
1223 $map->reset;
1224 undef $guard;
1225 $map = cf::map::find_map ($path)
1226 or return;
1227 }
1137 1228
1138 $cf::MAP{$key} = $map 1229 $cf::MAP{$key} = $map
1139 } 1230 }
1140} 1231}
1141 1232
1142sub load { 1233sub load {
1143 my ($self) = @_; 1234 my ($self) = @_;
1144 1235
1236 my $path = $self->{path};
1237 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1238
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1239 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1240
1147 $self->in_memory (cf::MAP_LOADING); 1241 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1242
1151 $self->alloc; 1243 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1244 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1245 or return;
1246
1247 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1248 if delete $self->{load_original};
1154 1249
1155 if (my $uniq = $path->uniq_path) { 1250 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1251 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1252 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1253 $self->clear_unique_items;
… …
1193} 1288}
1194 1289
1195sub save { 1290sub save {
1196 my ($self) = @_; 1291 my ($self) = @_;
1197 1292
1293 $self->{last_save} = $cf::RUNTIME;
1294
1295 return unless $self->dirty;
1296
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1297 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1299
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1300 $self->{load_path} = $save;
1206 1301
1207 return if $self->{deny_save}; 1302 return if $self->{deny_save};
1208
1209 warn "saving map ", $self->path;
1210 1303
1211 if ($uniq) { 1304 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1306 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1307 } else {
… …
1226 $self->save; 1319 $self->save;
1227 $self->clear; 1320 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1321 $self->in_memory (cf::MAP_SWAPPED);
1229} 1322}
1230 1323
1324sub reset_at {
1325 my ($self) = @_;
1326
1327 # TODO: safety, remove and allow resettable per-player maps
1328 return 1e99 if $self->{path}{user_rel};
1329 return 1e99 if $self->{deny_reset};
1330
1331 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1332 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1333
1334 $time + $to
1335}
1336
1231sub should_reset { 1337sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1338 my ($self) = @_;
1246 1339
1247 return if $self->players; 1340 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1341}
1249 1342
1250 warn "resetting map ", $self->path;#d# 1343sub unlink_save {
1344 my ($self) = @_;
1251 1345
1252 utf8::encode (my $save = $self->{path}->save_path); 1346 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1349}
1350
1351sub rename {
1352 my ($self, $new_path) = @_;
1353
1354 $self->unlink_save;
1355
1356 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path;
1358 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self;
1360
1361 $self->save;
1362}
1363
1364sub reset {
1365 my ($self) = @_;
1366
1367 return if $self->players;
1368 return if $self->{path}{user_rel};#d#
1369
1370 warn "resetting map ", $self->path;#d#
1371
1372 delete $cf::MAP{$self->path};
1255 1373
1256 $_->clear_links_to ($self) for values %cf::MAP; 1374 $_->clear_links_to ($self) for values %cf::MAP;
1257 1375
1376 $self->unlink_save;
1258 $self->clear; 1377 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1378}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 1379
1380my $nuke_counter = "aaaa";
1381
1382sub nuke {
1383 my ($self) = @_;
1384
1385 $self->{deny_save} = 1;
1386 $self->reset_timeout (1);
1387 $self->rename ("{nuke}/" . ($nuke_counter++));
1388 $self->reset; # polite request, might not happen
1261} 1389}
1262 1390
1263sub customise_for { 1391sub customise_for {
1264 my ($map, $ob) = @_; 1392 my ($map, $ob) = @_;
1265 1393
… …
1330 (ref $cf::CFG{"may_$access"} 1458 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1459 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1460 : $cf::CFG{"may_$access"})
1333} 1461}
1334 1462
1463=item $player_object->enter_link
1464
1465Freezes the player and moves him/her to a special map (C<{link}>).
1466
1467The player should be reaosnably safe there for short amounts of time. You
1468I<MUST> call C<leave_link> as soon as possible, though.
1469
1470=item $player_object->leave_link ($map, $x, $y)
1471
1472Moves the player out of the specila link map onto the given map. If the
1473map is not valid (or omitted), the player will be moved back to the
1474location he/she was before the call to C<enter_link>, or, if that fails,
1475to the emergency map position.
1476
1477Might block.
1478
1479=cut
1480
1335sub cf::object::player::enter_link { 1481sub cf::object::player::enter_link {
1336 my ($self) = @_; 1482 my ($self) = @_;
1337 1483
1484 $self->deactivate_recursive;
1485
1338 return if $self->map == $LINK_MAP; 1486 return if $self->map == $LINK_MAP;
1339 1487
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1489 if $self->map;
1342 1490
1343 $self->enter_map ($LINK_MAP, 20, 20); 1491 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1492}
1346 1493
1347sub cf::object::player::leave_link { 1494sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1495 my ($self, $map, $x, $y) = @_;
1349 1496
1350 my $link_pos = delete $self->{_link_pos}; 1497 my $link_pos = delete $self->{_link_pos};
1351 1498
1352 unless ($map) { 1499 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1500 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1501 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1502 $map = cf::map::find_map $map;
1358 1503
1359 unless ($map) { 1504 unless ($map) {
… …
1374 1519
1375 $self->activate_recursive; 1520 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1521 $self->enter_map ($map, $x, $y);
1377} 1522}
1378 1523
1524cf::player->attach (
1525 on_logout => sub {
1526 my ($pl) = @_;
1527
1528 # abort map switching before logout
1529 if ($pl->ob->{_link_pos}) {
1530 cf::sync_job {
1531 $pl->ob->leave_link
1532 };
1533 }
1534 },
1535 on_login => sub {
1536 my ($pl) = @_;
1537
1538 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link;
1542 Coro::async {
1543 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn
1545 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link;
1547 };
1548 }
1549 },
1550);
1551
1379=item $player_object->goto_map ($map, $x, $y) 1552=item $player_object->goto_map ($path, $x, $y)
1380 1553
1381=cut 1554=cut
1382 1555
1383sub cf::object::player::goto_map { 1556sub cf::object::player::goto_map {
1384 my ($self, $path, $x, $y) = @_; 1557 my ($self, $path, $x, $y) = @_;
… …
1389 $path = new cf::path $path; 1562 $path = new cf::path $path;
1390 1563
1391 my $map = cf::map::find_map $path->as_string; 1564 my $map = cf::map::find_map $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1565 $map = $map->customise_for ($self) if $map;
1393 1566
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1567# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1568# if $map;
1569
1570 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1571
1397 $self->leave_link ($map, $x, $y); 1572 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1573 })->prio (1);
1399} 1574}
1400 1575
… …
1741 1916
1742{ 1917{
1743 my $path = cf::localdir . "/database.pst"; 1918 my $path = cf::localdir . "/database.pst";
1744 1919
1745 sub db_load() { 1920 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 1921 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 1922 }
1749 1923
1750 my $pid; 1924 my $pid;
1751 1925
1752 sub db_save() { 1926 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 1927 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 1928 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 1929 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 1930 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 1931 rename "$path~", $path;
… …
1811} 1984}
1812 1985
1813sub main { 1986sub main {
1814 # we must not ever block the main coroutine 1987 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 1988 local $Coro::idle = sub {
1816 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1817 (Coro::unblock_sub { 1990 (Coro::unblock_sub {
1818 Event::one_event; 1991 Event::one_event;
1819 })->(); 1992 })->();
1820 }; 1993 };
1821 1994
… …
1826} 1999}
1827 2000
1828############################################################################# 2001#############################################################################
1829# initialisation 2002# initialisation
1830 2003
1831sub perl_reload() { 2004sub reload() {
1832 # can/must only be called in main 2005 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2006 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2007 warn "can only reload from main coroutine\n";
1835 return; 2008 return;
1836 } 2009 }
… …
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2136 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2137}
1965 2138
1966register "<global>", __PACKAGE__; 2139register "<global>", __PACKAGE__;
1967 2140
1968register_command "perl-reload" => sub { 2141register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2142 my ($who, $arg) = @_;
1970 2143
1971 if ($who->flag (FLAG_WIZ)) { 2144 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2145 $who->message ("start of reload.");
1973 perl_reload; 2146 reload;
1974 $who->message ("end of reload."); 2147 $who->message ("end of reload.");
1975 } 2148 }
1976}; 2149};
1977 2150
1978unshift @INC, $LIBDIR; 2151unshift @INC, $LIBDIR;
… …
2018 or warn "ERROR: unable to write runtime file: $!"; 2191 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2192 })->();
2020 }, 2193 },
2021); 2194);
2022 2195
2196END { cf::emergency_save }
2197
20231 21981
2024 2199

Diff Legend

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