a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-24 09:24:26 +03:00
Code Issues Projects Releases Wiki Activity

Avoid cloning a car's path when creating it. #368

Browse Source 
- 8 hours of downtown: 135s down to 126s
- prebaking: still hovering around 3m4s, plus or minus a few seconds
This commit is contained in:
Dustin Carlino 2020-10-16 13:12:19 -05:00
parent e66b058439
commit 32b11f03e8
2 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sim/src/mechanics/driving.rs
View File

@ -81,20 +81,20 @@ impl DrivingSimState {
sim
}
/// True if it worked
/// None if it worked, otherwise returns the CreateCar unmodified for possible retry.
pub fn start_car_on_lane(
&mut self,
now: Time,
params: CreateCar,
mut params: CreateCar,
map: &Map,
intersections: &IntersectionSimState,
parking: &ParkingSimState,
scheduler: &mut Scheduler,
) -> bool {
) -> Option<CreateCar> {
let first_lane = params.router.head().as_lane();
if !intersections.nobody_headed_towards(first_lane, map.get_l(first_lane).src_i) {
return false;
return Some(params);
}
if let Some(idx) = self.queues[&Traversable::Lane(first_lane)].get_idx_to_insert_car(
params.start_dist,
@ -156,7 +156,9 @@ impl DrivingSimState {
car.router.get_end_dist(),
first_lane
);
return false;
params.router = car.router;
params.vehicle = car.vehicle;
return Some(params);
}
}
@ -171,9 +173,9 @@ impl DrivingSimState {
queue.reserved_length += car.vehicle.length + FOLLOWING_DISTANCE;
}
self.cars.insert(car.vehicle.id, car);
return true;
return None;
}
false
Some(params)
}
/// State transitions for this car:
///

73
sim/src/sim/mod.rs
View File

@ -430,44 +430,25 @@ impl Sim {
.start_trip(self.time, id, trip_spec, maybe_req, maybe_path, &mut ctx);
}
Command::SpawnCar(create_car, retry_if_no_room) => {
if self.driving.start_car_on_lane(
// create_car contains a Path, which is expensive to clone. We need different parts
// of create_car after attempting start_car_on_lane. Make copies just of those
// here. In no case do we ever clone the path.
let id = create_car.vehicle.id;
let maybe_route = create_car.maybe_route;
let trip_and_person = create_car.trip_and_person;
let maybe_parked_car = create_car.maybe_parked_car.clone();
let req = create_car.req.clone();
if let Some(create_car) = self.driving.start_car_on_lane(
self.time,
create_car.clone(),
create_car,
map,
&self.intersections,
&self.parking,
&mut self.scheduler,
) {
if let Some((trip, person)) = create_car.trip_and_person {
self.trips
.agent_starting_trip_leg(AgentID::Car(create_car.vehicle.id), trip);
events.push(Event::TripPhaseStarting(
trip,
person,
Some(create_car.req.clone()),
if create_car.vehicle.id.1 == VehicleType::Car {
TripPhaseType::Driving
} else {
TripPhaseType::Biking
},
));
}
if let Some(parked_car) = create_car.maybe_parked_car {
if let ParkingSpot::Offstreet(b, _) = parked_car.spot {
// Buses don't start in parking garages, so trip must exist
events.push(Event::PersonLeavesBuilding(
create_car.trip_and_person.unwrap().1,
b,
));
}
self.parking.remove_parked_car(parked_car);
}
if let Some(route) = create_car.maybe_route {
self.transit.bus_created(create_car.vehicle.id, route);
}
self.analytics
.record_demand(create_car.router.get_path(), map);
} else if retry_if_no_room {
// Starting the car failed for some reason.
if retry_if_no_room {
// TODO Record this in the trip log
self.scheduler.push(
self.time + BLIND_RETRY_TO_SPAWN,
@ -495,6 +476,34 @@ impl Sim {
&mut ctx,
);
}
} else {
// Creating the car succeeded.
if let Some((trip, person)) = trip_and_person {
self.trips.agent_starting_trip_leg(AgentID::Car(id), trip);
events.push(Event::TripPhaseStarting(
trip,
person,
Some(req),
if id.1 == VehicleType::Car {
TripPhaseType::Driving
} else {
TripPhaseType::Biking
},
));
}
if let Some(parked_car) = maybe_parked_car {
if let ParkingSpot::Offstreet(b, _) = parked_car.spot {
// Buses don't start in parking garages, so trip must exist
events.push(Event::PersonLeavesBuilding(trip_and_person.unwrap().1, b));
}
self.parking.remove_parked_car(parked_car);
}
if let Some(route) = maybe_route {
self.transit.bus_created(id, route);
}
self.analytics
.record_demand(self.driving.get_path(id).unwrap(), map);
}
}
Command::SpawnPed(create_ped) => {
// Do the order a bit backwards so we don't have to clone the